[Spice-commits] Changes to 'spice.kvm.v28'

Gerd Hoffmann kraxel at kemper.freedesktop.org
Fri Jan 21 02:09:54 PST 2011


New branch 'spice.kvm.v28' available with the following commits:
commit 4de1ee2754ceb5a6a33e6db9f1924f8f46029ab2
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Fri Jan 21 10:41:07 2011 +0100

    locking fix #2

commit c6ba0a592383a00137b7a1553a844e691b739094
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Fri Jan 21 10:32:03 2011 +0100

    qxl: locking fix
    (cherry picked from commit fa6b53c60f2e0487524c7bd4684f6047e1db2ae9)

commit 5e49852a294a6fa75e176c58b31f852384c2c3a7
Merge: 8e5da4e292723499184b0f802106ef398b777974 49c486faa361c26ea6bf43ae3b63e76089621973
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Thu Jan 20 17:58:01 2011 +0100

    Merge remote branch 'kraxel/spice.v28' into spice.kvm.v28
    
    Conflicts:
    	Makefile.objs
    	Makefile.target

commit 8e5da4e292723499184b0f802106ef398b777974
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Tue Jan 4 22:04:30 2011 +0100

    pci-assign: Fix transition MSI->INTx
    
    Make sure to re-register the IRQ of an assigned device as INTx when the
    guest disables MSI[X] mode again.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Acked-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit ea6b0f11ecbd39d35ed8e638055215fc156aca96
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 19:26:23 2011 -0200

    remove qemu-kvm.h inclusion from monitor.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 3790795d0a88be1c2f306e5bd97227242f3ad2d0
Merge: 5f4a6f4efa393162def29f8e54a4a717803cb56a 3393ee074f89bbd827a2c5737f5bec365e8460a5
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 19:20:15 2011 -0200

    Merge branch 'upstream-merge'
    
    * upstream-merge: (279 commits)
      target-ppc: Implement correct NaN propagation rules
      target-mips: Implement correct NaN propagation rules
      softfloat: use float{32,64,x80,128}_maybe_silence_nan()
      softfloat: add float{x80,128}_maybe_silence_nan()
      softfloat: fix float{32,64}_maybe_silence_nan() for MIPS
      softfloat: rename *IsNaN variables to *IsQuietNaN
      softfloat: remove HPPA specific code
      target-ppc: use float32_is_any_nan()
      target-ppc: fix default qNaN
      target-ppc: remove PRECISE_EMULATION define
      microblaze: Use more TB chaining
      cirrus_vga: fix division by 0 for color expansion rop
      Fix curses on big endian hosts
      noaudio: correctly account acquired samples
      target-arm: Implement correct NaN propagation rules
      softfloat: abstract out target-specific NaN propagation rules
      softfloat: Rename float*_is_nan() functions to float*_is_quiet_nan()
      TCG: Improve tb_phys_hash_func()
      target-arm: fix UMAAL instruction
      Fix translation of unary PPC/SPE instructions (efdneg etc.).
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 3393ee074f89bbd827a2c5737f5bec365e8460a5
Merge: ea59ccd22c3957f9ef8c7828b5c1e778ab35b302 e024e881bb1a8b5085026589360d26ed97acdd64
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 19:19:20 2011 -0200

    Merge commit 'e024e881bb1a8b5085026589360d26ed97acdd64' into upstream-merge
    
    * commit 'e024e881bb1a8b5085026589360d26ed97acdd64': (133 commits)
      target-ppc: Implement correct NaN propagation rules
      target-mips: Implement correct NaN propagation rules
      softfloat: use float{32,64,x80,128}_maybe_silence_nan()
      softfloat: add float{x80,128}_maybe_silence_nan()
      softfloat: fix float{32,64}_maybe_silence_nan() for MIPS
      softfloat: rename *IsNaN variables to *IsQuietNaN
      softfloat: remove HPPA specific code
      target-ppc: use float32_is_any_nan()
      target-ppc: fix default qNaN
      target-ppc: remove PRECISE_EMULATION define
      microblaze: Use more TB chaining
      cirrus_vga: fix division by 0 for color expansion rop
      Fix curses on big endian hosts
      noaudio: correctly account acquired samples
      target-arm: Implement correct NaN propagation rules
      softfloat: abstract out target-specific NaN propagation rules
      softfloat: Rename float*_is_nan() functions to float*_is_quiet_nan()
      TCG: Improve tb_phys_hash_func()
      target-arm: fix UMAAL instruction
      Fix translation of unary PPC/SPE instructions (efdneg etc.).
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit ea59ccd22c3957f9ef8c7828b5c1e778ab35b302
Merge: 5e10257364dd653cae26eb61b699f8562f445d4d 7572150c189c6553c2448334116ab717680de66d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 19:14:12 2011 -0200

    Merge commit '7572150c189c6553c2448334116ab717680de66d' into upstream-merge
    
    * commit '7572150c189c6553c2448334116ab717680de66d':
      vnc/spice: add set_passwd monitor command.
      vnc: support password expire
      vnc: auth reject cleanup
      spice: add qmp 'query-spice' and hmp 'info spice' commands.
      spice: connection events.
    
    Conflicts:
    	hmp-commands.hx
    	monitor.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 5e10257364dd653cae26eb61b699f8562f445d4d
Merge: d65356c9b59a1894aede7fa37e7fda2859bd3215 a19cbfb346425cc760ed19b4e746417df636b761
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 18:57:47 2011 -0200

    Merge commit 'a19cbfb346425cc760ed19b4e746417df636b761' into upstream-merge
    
    * commit 'a19cbfb346425cc760ed19b4e746417df636b761':
      spice: add qxl device
      spice: add qxl vgabios binary.
    
    Conflicts:
    	Makefile.target
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit d65356c9b59a1894aede7fa37e7fda2859bd3215
Merge: 0768091bceffd095f9f2df9f846a596bbb4bed32 624c716cc576ec5e6bed50da3deb45aa9537cacd
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 18:53:20 2011 -0200

    Merge commit '624c716cc576ec5e6bed50da3deb45aa9537cacd' into upstream-merge
    
    * commit '624c716cc576ec5e6bed50da3deb45aa9537cacd':
      Makefile: make msix/msi depend on CONFIG_PCI
    
    Conflicts:
    	Makefile.objs
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 0768091bceffd095f9f2df9f846a596bbb4bed32
Merge: 4f5c5b063247675a7d76df7c75f3af2cc979db38 962630f207a33b7de4316022884b5241e05491cd
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 18:46:00 2011 -0200

    Merge commit '962630f207a33b7de4316022884b5241e05491cd' into upstream-merge
    
    * commit '962630f207a33b7de4316022884b5241e05491cd': (33 commits)
      Pass boot device list to firmware.
      Add notifier that will be called when machine is fully created.
      Add bootindex for option roms.
      Change fw_cfg_add_file() to get full file path as a parameter.
      Add bootindex parameter to net/block/fd device
      Add get_fw_dev_path callback to scsi bus.
      Add get_fw_dev_path callback for usb bus.
      Record which USBDevice USBPort belongs too.
      Add get_fw_dev_path callback for pci bus.
      Add get_fw_dev_path callback for system bus.
      Add get_fw_dev_path callback to IDE bus.
      Store IDE bus id in IDEBus structure for easy access.
      Add get_fw_dev_path callback to ISA bus in qdev.
      Keep track of ISA ports ISA device is using in qdev.
      Introduce new BusInfo callback get_fw_dev_path.
      Introduce fw_name field to DeviceInfo structure.
      monitor: implement x86 info mem for PAE and long modes
      monitor: implement x86 info tlb for PAE and long modes
      wdt_i6300esb: register a reset function
      isa-bus.c: use hw_error instead of fprintf
      ...
    
    Conflicts:
    	vl.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4f5c5b063247675a7d76df7c75f3af2cc979db38
Merge: 4598704bba5f10fcd6591b15be2ad99b7622a06a 4a9dd6658268a942a8ea230f950a951229355cbb
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 17:59:52 2011 -0200

    Merge commit '4a9dd6658268a942a8ea230f950a951229355cbb' into upstream-merge
    
    * commit '4a9dd6658268a942a8ea230f950a951229355cbb':
      pci: untangle pci/msi dependency
      pci: make command SERR bit writable
      virtio-net: stop/start bh when appropriate
      virtio-net: don't dma while vm is stopped
      migration/savevm: no need to flush requests
      cpus: flush all requests on each vm stop
      net/sock: option to specify local address
    
    Conflicts:
    	hw/pci.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4598704bba5f10fcd6591b15be2ad99b7622a06a
Merge: 833ae13cfbeb9f5ef32b885f5d127d801e4ca654 2507c12ab026b2286b0a47035c629f3d568c96f4
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 17:54:29 2011 -0200

    Merge commit '2507c12ab026b2286b0a47035c629f3d568c96f4' into upstream-merge
    
    * commit '2507c12ab026b2286b0a47035c629f3d568c96f4': (89 commits)
      Add endianness as io mem parameter
      exec: introduce endianness swapped mmio
      noaudio: fix return value for read()
      ppc: kvm: fix signedness warning
      Speedup 'tb_find_slow' by using the same heuristic as during memory page lookup
      Remove unused spin_trylock() function
      darwin-user: Use GCC_FMT_ATTR (format checking)
      audio: Use GCC_FMT_ATTR (format checking)
      target-sparc: Use fprintf_function (format checking)
      *-dis: Replace fprintf_ftype by fprintf_function (format checking)
      Fix mingw32 and OpenBSD warnings
      exec: Remove debugging fprintf() that slipped into qemu_ram_alloc_from_ptr()
      linux-user: fix mips and ppc to use UID16
      update binfmt conf
      linux-user: fix compiler error on nptl
      ARM: linux-user: Restore iWMMXT state from ucontext on sigreturn
      ARM: linux-user: Expose iWMMXT registers to signal handlers
      ARM: linux-user: Restore VFP state from ucontext on sigreturn
      ARM: linux-user: Expose VFP registers to signal handlers
      ARM: Expose vfp_get_fpscr() and vfp_set_fpscr() to C code
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 833ae13cfbeb9f5ef32b885f5d127d801e4ca654
Merge: 5f4a6f4efa393162def29f8e54a4a717803cb56a 661a1799ba6544a54888283db19dd51469da01e5
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Jan 6 17:44:19 2011 -0200

    Merge commit '661a1799ba6544a54888283db19dd51469da01e5' into upstream-merge
    
    * commit '661a1799ba6544a54888283db19dd51469da01e5':
      Add pcnet-pci.c
      Split out common pcnet code
      Remove PCI from sparc32 target
      Detect missing config includes
      Fix previous commit
      VirtIO config option
      PCI config include
      Include directives in default configs
      Add missing dependency.
    
    Conflicts:
    	Makefile.objs
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 5f4a6f4efa393162def29f8e54a4a717803cb56a
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Sun Jan 2 20:33:13 2011 +0100

    qemu-kvm: x86: Remove duplicate MSR_VM_HSAVE_PA from kvm_get_msrs
    
    Obviously a merge artifact.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 5968ae92b5cc51d3a7b70cf3b117ab313a3ae420
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Wed Dec 29 19:53:39 2010 +0100

    qemu-kvm: Drop redundant kvm_reset_mpstate
    
    kvm_arch_reset_vcpu includes the same logic (minus the obsolete feature
    check), and every caller of kvm_reset_mpstate also calls that function.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit b724fa4bb46b82c54b5f0a2cf9177194020433ef
Author: Markus Armbruster <armbru at redhat.com>
Date:   Wed Dec 22 13:33:39 2010 +0100

    qemu-kvm: Switch to upstream -enable-kvm semantics
    
    We currently enable KVM by default, and when it's not available, we
    print a message and fall back to TCG.  Option -enable-kvm is ignored.
    Option -no-kvm suppresses KVM.
    
    Upstream works differently: KVM is off by default, -enable-kvm
    switches it on.  -enable-kvm terminates the process unsuccessfully if
    KVM is not available.
    
    upstream qemu   |  default  |-enable-kvm
    ----------------+-----------+-----------
    KVM available   | disabled  |  enabled
    KVM unavailable | disabled  |    fail
    
    qemu-kvm        |  default  |-enable-kvm|  -no-kvm
    ----------------+-----------+-----------+----------
    KVM available   |  enabled* |  enabled  |  disabled
    KVM unavailable | disabled  | disabled* |  disabled
    
    * differs from upstream
    
    Users of qemu and qemu-kvm need to be aware of these differences to
    enable / disable use of KVM reliably.  This is bothersome.
    
    Consider -enable-kvm when KVM is unavailable: If the user expects
    qemu-kvm behavior (fall back), but qemu fails, he'll likely be
    surprised and unhappy.  If the user expects upstream behavior (fail),
    but qemu-kvm falls back to TCG, the guest runs slow as molasses, and
    the user will likely be confused and unhappy (unless he spots and
    understands the "disable KVM" message).
    
    Eventually, we'll sort this upstream with -accel (defaults tied to
    machine type).  Until then, this patch reduces the difference to
    upstream so that most users shouldn't need to be aware of them.
    
    Make -enable-kvm behave just like in upstream: enable KVM, fail if not
    available.  But retain current default behavior: enable KVM, fall back
    to TCG.
    
    qemu-kvm new    |  default  |-enable-kvm|  -no-kvm
    ----------------+-----------+-----------+-----------
    KVM available   |  enabled* |  enabled  |  disabled
    KVM unavailable | disabled  |    fail+  |  disabled
    
    * differs from upstream
    + changed by this patch
    
    Bonus fix: -no-kvm -enable-kvm now enables KVM.  Before, it disabled it.
    
    Signed-off-by: Markus Armbruster <armbru at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 8ce764af21a4b1f1754efa7c3fa7041dde55417d
Author: Gleb Natapov <gleb at redhat.com>
Date:   Wed Dec 22 17:18:49 2010 +0200

    Add ability to drop pages through testdev
    
    Signed-off-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 571a2b67f3d6986f768d0623df6d97847e4b153e
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date:   Thu Dec 9 14:43:14 2010 +0800

    fix compile error of hw/device-assignment.c
    
    Fix the following compile error in next tree:
      CC    x86_64-softmmu/device-assignment.o
    hw/device-assignment.c: In function ‘assigned_device_pci_cap_init’:
    hw/device-assignment.c:1463: error: ‘PCI_PM_CTRL_NO_SOFT_RST’ undeclared (first use in this function)
    hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once
    hw/device-assignment.c:1463: error: for each function it appears in.)
    
    Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Acked-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 9e8caf52f2e9976faf83bfc588102912160ce911
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Thu Dec 9 09:16:22 2010 -0700

    pci: Fix PCI capabilities collision error value
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Acked-by: Markus Armbruster <armbru at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit cb1983b8809d0e06a97384a40bad1194a32fc814
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Dec 6 09:23:08 2010 -0700

    device-assignment: pass through and stub more PCI caps
    
    Some drivers depend on finding capabilities like power management,
    PCI express/X, vital product data, or vendor specific fields.  Now
    that we have better capability support, we can pass more of these
    tables through to the guest.  Note that VPD and VNDR are direct pass
    through capabilies, the rest are mostly empty shells with a few
    writable bits where necessary.
    
    It may be possible to consolidate dummy capabilities into common files
    for other drivers to use, but I prefer to leave them here for now as
    we figure out what bits to handle directly with hardware and what bits
    are purely emulated.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit ff26d407b43449d9e59284cce2afc8c9c9324776
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Dec 6 09:22:56 2010 -0700

    device-assignment: Error checking when adding capabilities
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 15ddab0ae48b7b7ac8a154d9df7e37b9cd4583a3
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Dec 6 09:22:48 2010 -0700

    pci: Error on PCI capability collisions
    
    Nothing good can happen when we overlap capabilities
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 3de4c3634b341335f2750a517eb9754dcc3b580f
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Dec 6 09:22:38 2010 -0700

    pci: Remove PCI_CAPABILITY_CONFIG_*
    
    Half of these aren't used anywhere, the other half are wrong.  Now that
    device assignment is trying to match physical hardware offsets for PCI
    capabilities, we can't round up the MSI and MSI-X length.  MSI-X is
    always 12 bytes.  MSI is variable length depending on features, but for
    the current device assignment implementation, it's always the minimum
    length of 10 bytes.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 058d2ef893549363860c89ad5971ea5f0ab05114
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Dec 6 09:22:10 2010 -0700

    device-assignment: Fix off-by-one in header check
    
    Include the first byte at 40h or else access might go to the
    hardware instead of the emulated config space, resulting in
    capability loops, since the ordering is different.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 53b6d3d5c2522e881c8d194f122de3114f6f76eb
Merge: bdce0cb95bc07c2d0585210a4fe42f3c9c437a6b a8118d82afa60d435b7033d5f8e42ca3f8f2f10d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Dec 2 12:15:20 2010 -0200

    Merge branch 'upstream-merge'
    
    * upstream-merge: (51 commits)
      microblaze: target-ify target_ucontext
      virtio-pci: Convert fprintf() to error_report()
      virtio-net: Convert fprintf() to error_report()
      virtio: Convert fprintf() to error_report()
      virtio-blk: Convert fprintf() to error_report()
      vgabios update: handle compatibility with older qemu versions
      pcnet: Do not receive external frames in loopback mode
      piix4 acpi: convert io BAR to type-safe ioport callbacks
      Type-safe ioport callbacks
      trace: Trace vm_start()/vm_stop()
      virtfs: enable MSI-X
      pc: add 0.13 pc machine type
      trace: Use fprintf_function (format checking)
      slirp: Remove unused code for bad sprintf
      pc: disable the BOCHS BIOS panic port
      optionrom: fix bugs in signrom.sh
      Makefile: Fix check dependency breakage
      block migration: do not submit multiple AIOs for same sector
      block: set sector dirty on AIO write completion
      block: fix shift in dirty bitmap calculation
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit a8118d82afa60d435b7033d5f8e42ca3f8f2f10d
Merge: 9b421939fb38b8e3573e9f04e2a6b38fcb61b09a f711df67d611e4762966a249742a5f7499e19f99
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Dec 2 12:13:43 2010 -0200

    Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-merge
    
    * commit 'f711df67d611e4762966a249742a5f7499e19f99': (41 commits)
      microblaze: target-ify target_ucontext
      virtio-pci: Convert fprintf() to error_report()
      virtio-net: Convert fprintf() to error_report()
      virtio: Convert fprintf() to error_report()
      virtio-blk: Convert fprintf() to error_report()
      vgabios update: handle compatibility with older qemu versions
      pcnet: Do not receive external frames in loopback mode
      piix4 acpi: convert io BAR to type-safe ioport callbacks
      Type-safe ioport callbacks
      trace: Trace vm_start()/vm_stop()
      virtfs: enable MSI-X
      pc: add 0.13 pc machine type
      trace: Use fprintf_function (format checking)
      slirp: Remove unused code for bad sprintf
      pc: disable the BOCHS BIOS panic port
      optionrom: fix bugs in signrom.sh
      Makefile: Fix check dependency breakage
      block migration: do not submit multiple AIOs for same sector
      block: set sector dirty on AIO write completion
      block: fix shift in dirty bitmap calculation
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 9b421939fb38b8e3573e9f04e2a6b38fcb61b09a
Merge: f6f8864b9b3ae1ea151c2b781792a5e72baaa178 4cff0a5994d0300e6e77e90d3354aa517a120539
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Dec 2 12:03:34 2010 -0200

    Merge commit '4cff0a5994d0300e6e77e90d3354aa517a120539' into upstream-merge
    
    * commit '4cff0a5994d0300e6e77e90d3354aa517a120539':
      pci: allow hotplug removal of cold-plugged devices
      PCI: Bus number from the bridge, not the device
      e1000: Fix TCP checksum overflow with TSO
      tap: make set_offload a nop after netdev cleanup
      Add support for async page fault to qemu
      tap: clear vhost_net backend on cleanup
      more stdvga cleanups.
      switch vmware_vga to pci vgabios
      switch stdvga to pci vgabios
    
    Conflicts:
    	hw/acpi_piix4.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit f6f8864b9b3ae1ea151c2b781792a5e72baaa178
Merge: bdce0cb95bc07c2d0585210a4fe42f3c9c437a6b 3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Dec 2 11:51:26 2010 -0200

    Merge commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4' into upstream-merge
    
    * commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4':
      Add new vgabios binaries to blobs list.
    
    Conflicts:
    	pc-bios/vgabios-cirrus.bin
    	pc-bios/vgabios.bin
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit bdce0cb95bc07c2d0585210a4fe42f3c9c437a6b
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:20:56 2010 -0700

    device-assignment: Make use of config_map
    
    We can figure out the capability being touched much more quickly
    and efficiently with the config_map.  Use it.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit fb9b69f921d10213992b12dede53440039d3d820
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:20:39 2010 -0700

    pci: Remove capability specific handlers
    
    Drivers can break these out on their own if they need to.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit a37feb7175532f8fa679e22c501170877befcded
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:20:18 2010 -0700

    device-assignment: Move PCI capabilities to match physical hardware
    
    Now that common PCI code doesn't have a hangup on capabilities
    being contiguous, move assigned device capabilities to match
    their offset on physical hardware.  This helps for drivers that
    assume a capability configuration and don't bother searching.
    
    We can also remove several calls to assigned_dev_pci_read_* because
    we're overlaying the capability at the same location as the initial
    copy we made of config space.  We can therefore just use pci_get_*.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 355f2bf993379398251fddbdc8b1c8cc123a570e
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:20:04 2010 -0700

    pci: Remove cap.length, cap.start, cap.supported
    
    Capabilities aren't required to be contiguous, so cap.length never
    really made much sense.  Likewise, cap.start is mostly meaningless
    too.  Both of these are better served by the capability map.  We
    can also get rid of cap.supported, since it's really now unused
    and redundant with flag in the status word anyway.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 1f3ef957426124e3e7649ce6766874e3753aa055
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:19:49 2010 -0700

    pci: Replace used bitmap with config byte map
    
    Capabilities are allocated in bytes, so we can track both whether
    a byte is used and by what capability in the same structure.
    
    Remove pci_reserve_capability() as there are no users, remove
    pci_access_cap_config() since it's now a trivial lookup.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit aaab315bfe74e7081380517b1837d28f40e509e3
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:19:35 2010 -0700

    device-assignment: Use PCI capabilities support
    
    Convert to use common pci_add_capabilities() rather than creating
    our own mess.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 87ba8237a10bed58d4e6a070ea797998a8c24fef
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:19:22 2010 -0700

    pci: Remove pci_enable_capability_support()
    
    This interface doesn't make much sense, adding a capability can
    take care of everything, just provide a means to register
    capability read/write handlers.
    
    Device assignment does it's own thing, so requires a couple
    ugly hacks that will be cleaned by subsequent patches.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 1164350eb791c33a7815e26f33dc45bccf99ef6e
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Nov 19 16:19:11 2010 -0700

    pci: pci_default_cap_write_config ignores wmask
    
    Make use of wmask, just like the rest of config space.
    
    This duplicates code in pci_default_write_config, but we plan to get
    rid of this function anyway, so avoid the code churn.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit b1e0e1b96ce3fd8cef0f74e8cff24d97c899f5ea
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Tue Nov 23 16:54:42 2010 +0200

    qemu-kvm: remove unused setupcpuid
    
    kvm_setup_cpuid seems unused, so remove it.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit b377474e589e5a1fe2abc7b13fafa8bad802637a
Author: Bernhard Kohl <bernhard.kohl at nsn.com>
Date:   Tue Nov 16 15:05:29 2010 +0100

    device-assignment: register a reset function
    
    This is necessary because during reboot of a VM the assigned devices
    continue DMA transfers which causes memory corruption.
    
    Acked-by: Alex Williamson <alex.williamson at redhat.com>
    Acked-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Thomas Ostler <thomas.ostler at nsn.com>
    Signed-off-by: Bernhard Kohl <bernhard.kohl at nsn.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4f21cd82ecede4a065def2ff146cd001078ffcb8
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Nov 15 16:11:19 2010 -0700

    device-assignment: Register as un-migratable
    
    Use register_device_unmigratable() to declare ourselves as
    non-migratable.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 08bb9f6b1a5d8f4f5dd5bafad2876067797cb8b4
Author: Bernhard Kohl <bernhard.kohl at nsn.com>
Date:   Mon Nov 15 17:58:17 2010 +0100

    make-release: fix mtime for a wider range of git versions
    
    With the latest git versions, e.g. 1.7.2.3, git still prints out
    the tag info in addition to the requested format. So let's simply
    fetch the first line from the output.
    
    In addition I use the --pretty option instead of --format which
    is not recognized in very old git versions, e.g. 1.5.5.6.
    
    Tested with git versions 1.5.5.6 and 1.7.2.3.
    
    Signed-off-by: Bernhard Kohl <bernhard.kohl at nsn.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 8b77c9e242537ba86aa4b5a504e7c29d16dad5d2
Merge: 2be805620ae3ef1e50bd95459ac5e793f3bd6108 6c52ef31bcb351af944ce2882b2cc3ad0938a7c8
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Nov 16 17:58:01 2010 +0200

    Merge branch 'next'
    
    * next:
      kvm: clear vapic after reset
      vapic: fix vapic option rom sizing
      optionrom: fix bugs in signrom.sh
      tpr optimization: clear the vapic area on boot

commit 6c52ef31bcb351af944ce2882b2cc3ad0938a7c8
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Nov 16 16:31:13 2010 +0200

    kvm: clear vapic after reset
    
    Clear the vapic address immediately after reset.  This allows dual-boot guests
    to work efficiently, and more importantly, works around the bios using
    'rep insb' to read in the option rom and confusing the vapic machinery.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 7080e7f20633ab9a566324ccefadd23f0c14bd4f
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Nov 16 16:11:31 2010 +0200

    vapic: fix vapic option rom sizing
    
    An option rom is required to be aligned to 512 bytes, and to have some
    space for a signature.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 5a14f14187daa197e995f253c76a2c576b1a3b41
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Nov 16 16:05:32 2010 +0200

    optionrom: fix bugs in signrom.sh
    
    signrom.sh has multiple bugs:
    
    - the last byte is considered when calculating the existing checksum, but not
      when computing the correction
    - apprently the 'expr' expression overflows and produces incorrect results with
      larger roms
    - if the checksum happened to be zero, we calculated the correction byte to be
      256
    
    Instead of rewriting this in half a line of python, this patch fixes the bugs.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 284e648036510a322d21be574302f7aec1c9a89b
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Nov 16 12:48:02 2010 +0200

    tpr optimization: clear the vapic area on boot
    
    If the option rom is loaded with rep/insb (as newer seabios versions do), then
    the writes to the vapic area may be corrupted by the kernel.
    
    Fix by explicitly clearing the vapic area on option rom startup.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 2be805620ae3ef1e50bd95459ac5e793f3bd6108
Merge: 420fe74769cc67baec6f3d962dc054e2972ca3ae 38be1ea9d08c2197d68a0c790d5e6ac5d2acd20d
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:49:27 2010 +0200

    Merge branch 'upstream-merge'
    
    * upstream-merge: (91 commits)
      add copyright to spiceaudio
      spice: add audio
      intel-hda: fix codec addressing.
      Revert "intel-hda: fix codec addressing."
      intel-hda: fix codec addressing.
      intel-hda: add msi support
      intel-hda: update irq status on WAKEEN changes.
      intel-hda: Honor WAKEEN bits.
      hda-audio: exit cleanup
      intel-hda: exit cleanup
      Fix win32 build
      scsi-disk: Fix immediate failure of bdrv_aio_*
      virtio-blk: Handle immediate flush failure properly
      ide: Handle immediate bdrv_aio_flush failure
      block: avoid a warning on 64 bit hosts with long as int64_t
      qcow2: Invalidate cache after failed read
      vpc: Implement bdrv_flush
      scsi-disk: Implement werror for flushes
      scsi-disk: Complete failed requests in scsi_disk_emulate_command
      block: Allow bdrv_flush to return errors
      ...
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 38be1ea9d08c2197d68a0c790d5e6ac5d2acd20d
Merge: 031871007b88a18309807c35568f135a49be60fe cf2c1839a955482f2e208d7400594bf076c222f2
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:49:09 2010 +0200

    Merge remote branch 'upstream' into upstream-merge
    
    * upstream: (46 commits)
      add copyright to spiceaudio
      spice: add audio
      intel-hda: fix codec addressing.
      Revert "intel-hda: fix codec addressing."
      intel-hda: fix codec addressing.
      intel-hda: add msi support
      intel-hda: update irq status on WAKEEN changes.
      intel-hda: Honor WAKEEN bits.
      hda-audio: exit cleanup
      intel-hda: exit cleanup
      Fix win32 build
      scsi-disk: Fix immediate failure of bdrv_aio_*
      virtio-blk: Handle immediate flush failure properly
      ide: Handle immediate bdrv_aio_flush failure
      block: avoid a warning on 64 bit hosts with long as int64_t
      qcow2: Invalidate cache after failed read
      vpc: Implement bdrv_flush
      scsi-disk: Implement werror for flushes
      scsi-disk: Complete failed requests in scsi_disk_emulate_command
      block: Allow bdrv_flush to return errors
      ...
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 031871007b88a18309807c35568f135a49be60fe
Merge: 338be4505b537f50e345254982e4bf127194dd0c c1b0b93b06ab026ef45ae02d0ee7557741910637
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:47:58 2010 +0200

    Merge commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637' into upstream-merge
    
    * commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637':
      Move QEMU OS dependant library functions to OS specific files
      target-xxx: Use fprintf_function (format checking)
    
    Conflicts:
    	osdep.c
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 338be4505b537f50e345254982e4bf127194dd0c
Merge: 4ba1bf027928c79482549d1d8a65134f028a9917 b907b69dd75415bc28349d1dd1e9a598ddace463
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:40:09 2010 +0200

    Merge commit 'b907b69dd75415bc28349d1dd1e9a598ddace463' into upstream-merge
    
    * commit 'b907b69dd75415bc28349d1dd1e9a598ddace463': (24 commits)
      pcie: update satus on reset
      msi: minor cleanups
      msi: simplify range checks
      pci: improve w1c mask handling
      pcie: clean up hot plug notification
      pcie: simplify range check
      Introduce range.h
      qemu-options.def: add to generated header list
      net: properly handle illegal fd/vhostfd from command line
      virtio: sanity-check available index
      migration: don't segfault on invalid input
      x3130: pcie downstream port
      x3130: pcie upstream port
      ioh3420: pcie root port in X58 ioh
      pcie port: define struct PCIEPort/PCIESlot and helper functions
      pci/bridge: fix pci_bridge_reset()
      pcie: comment on hpev_intx
      pcie: helper functions for pcie capability and extended capability
      pcie: add pcie constants to pcie_regs.h
      msi: implements msi
      ...
    
    Conflicts:
    	Makefile.objs
    	hw/pci.c
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 4ba1bf027928c79482549d1d8a65134f028a9917
Merge: a243f2c681abe48b613db63bd2b58366330e6ce0 57c6db2e2dec77a60bcfe6f93d756653f444a1f2
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:35:17 2010 +0200

    Merge commit '57c6db2e2dec77a60bcfe6f93d756653f444a1f2' into upstream-merge
    
    * commit '57c6db2e2dec77a60bcfe6f93d756653f444a1f2':
      msix: clear not only INTA, but all INTx when MSI-X is enabled.
      pci: implement RW1C register framework.
      pci: improve signature of pci_register_bar().
      pci: don't ignore invalid parameter for pci_register_bar().
      pci: sorting out type confusion in pci_register_bar().
      pci_ids.h: add vendor id of Texas Intesruments
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit a243f2c681abe48b613db63bd2b58366330e6ce0
Merge: 47f1b51a79b2c7b7591e06e7fb01d5c9cc30f0b8 43c945f16a172f07145ca1f30abb958070228690
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:14:08 2010 +0200

    Merge commit '43c945f16a172f07145ca1f30abb958070228690' into upstream-merge
    
    * commit '43c945f16a172f07145ca1f30abb958070228690':
      pci: make pci_parse_devfn() aware of func.
      pci: call hotplug callback even when not hotplug case for later use.
      pci bridge: add helper function for ssvid capability.
    
    Conflicts:
    	hw/pci.c
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 47f1b51a79b2c7b7591e06e7fb01d5c9cc30f0b8
Merge: 9887e4e27e04799c8a1328dae9d7d54b34fda825 055403b2a72729497fb58e0c6293547e767679d3
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 16:08:38 2010 +0200

    Merge commit '055403b2a72729497fb58e0c6293547e767679d3' into upstream-merge
    
    * commit '055403b2a72729497fb58e0c6293547e767679d3':
      exec: Use fprintf_function for dump_exec_info (format checking)
      tcg: Use fprintf_function (format checking)
      Add fprintf_function for function pointers to fprintf-like functions
      Mov muldiv64 to qemu-common.h (Thus unbreaking gus)
    
    Conflicts:
    	exec.c
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 9887e4e27e04799c8a1328dae9d7d54b34fda825
Merge: cfe2b2060a7e087871530602001c0b532c2693fe ca77089d2d8e73283bfc73f03d954504561e1ce8
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 15:47:24 2010 +0200

    Merge commit 'ca77089d2d8e73283bfc73f03d954504561e1ce8' into upstream-merge
    
    * commit 'ca77089d2d8e73283bfc73f03d954504561e1ce8':
      pci: consolidate pci_add_capability_at_offset() into pci_add_capability().
      pci_bridge: introduce pci bridge library.
      pci_bridge: clean up: remove pci_{register, unregister}_secondary_bus()
      pci_bridge: rename PCIBridge::bus -> PCIBridge::sec_bus.
    
    Conflicts:
    	hw/msix.c
    	hw/pci.h
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit cfe2b2060a7e087871530602001c0b532c2693fe
Merge: 420fe74769cc67baec6f3d962dc054e2972ca3ae 783753fd53fe513d37fbbfe6694c0c1ab9701fd1
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Nov 14 15:18:50 2010 +0200

    Merge commit '783753fd53fe513d37fbbfe6694c0c1ab9701fd1' into upstream-merge
    
    * commit '783753fd53fe513d37fbbfe6694c0c1ab9701fd1':
      pci/bridge: split out pci bridge code into pci_bridge.c from pci.c
      pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info.
    
    Conflicts:
    	Makefile.objs
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 420fe74769cc67baec6f3d962dc054e2972ca3ae
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Sun Nov 7 14:08:01 2010 +0100

    pci-assign: Catch missing KVM support
    
    Report an error instead of raising a SEGV when a pci-assign device is
    about to be initialized without KVM enabled.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit b2ca03af8204d79b8c290cadbd2e4442a7281b64
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Tue Nov 2 15:55:37 2010 +0100

    pci-assign: Remove broken -pcidevice and pci_add host
    
    These qemu-kvm-only interfaces were broken by b560a9ab9b, but no one
    complained loud enough to get them fixed again. As we have properly
    working "-device pci-assign"/"device_add" and we won't push this
    upstream anyway, there is likely no point in restoring the interface.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    CC: Markus Armbruster <armbru at redhat.com>
    CC: Daniel P. Berrange <berrange at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 754da3e07f287525e5f75c5acd6b30f522641e73
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Tue Nov 2 15:55:36 2010 +0100

    pci-assign: Issue warning when running w/o IOMMU
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 2e04af7e37d7d03890c0fcb01802792d37d8bc5e
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Tue Nov 2 15:55:35 2010 +0100

    pci-assign: Allow to disable MSI perference for host IRQ
    
    Some devices (e.g. the ath9k) claim to support MSI but actually do not
    work when this is enabled. We must not blindly switch such devices to
    MSI but rather provide the user a way to pass control back to the
    guest driver. This can be done by turning the new property "prefer_msi"
    off (default remains on).
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 3d6c783ab0a84a4a51fda7acec2c9858e9b4c51c
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Tue Nov 2 15:55:34 2010 +0100

    pci-assign: Convert iommu property to booleam
    
    Defining the iommu property as an integer opens the door for confusion
    (Is it an index or a switch?). Fix this by converting it to a bit
    property that can be on or off, nothing else.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 8160019d5f2274916125faef29d2dd2051edca03
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 25 21:10:10 2010 -0200

    qemu-kvm-x86: fix e820 reservation
    
    e820 reserved range should start at 0xfeffc000, which includes
    the EPT identity page, not 0xfeffd000.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 28752f4661e7f73cc972fcf507c633e415f669e5
Author: Tim Pepper <lnxninja at linux.vnet.ibm.com>
Date:   Tue Oct 26 10:52:00 2010 -0700

    extraneous allocation in qemu-kvm's hw/pc_piix.c
    
    While doing some source review I noticed what appears to be
    an extraneous call to pc_allocate_cpu_irq() in qemu-kvm and
    which does not appear in qemu.  From the git history it almost
    looks like b725a661eb38c93086e0b98f626a3864ae8651b8 mis-merged
    845773ab03a8dde681ff1b929bbb41e67d0131a6?  At any rate qemu-kvm got
    patched differently than qemu for the piix split out and this line
    appears to allocate something which then goes unused.
    
    Signed-off-by: Tim Pepper <lnxninja at linux.vnet.ibm.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 332669e82c6703ac77c43d066431fc60d6a61b52
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Nov 3 10:30:38 2010 -0200

    Fix -M isapc segfault
    
    Reported-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 6983f3bba2cc820b882cf6071d7cf3bb113af47e
Merge: 185b93006873e14cb2e33720d5a0c7115972032a 174b2877b0f6a607f994f7a5b9b9a36caaff5d75
Author: Avi Kivity <avi at redhat.com>
Date:   Thu Oct 28 17:01:07 2010 +0200

    Merge branch 'master' of git://git.sv.gnu.org/qemu into next
    
    * 'master' of git://git.sv.gnu.org/qemu: (26 commits)
      seabios: Update to 0.6.1
      qemu-timer: move commonly used timer code to qemu-timer-common
      rewrite i386 tests Makefile
      fix test_path
      make runcom compile on recent distributions
      disable test_enter on i386, it is broken
      unbreak "make" from vpath-built tests directory
      unbreak "make" from tests directory
      mips_fulong2e: fix ram allocation
      Replace remaining gcc format attributes by macro GCC_FMT_ATTR (format checking)
      Remove special handling of system include files (no longer needed)
      virtio-blk: Respect werror option for flushes
      ide: Handle flush failure
      ide: Factor ide_flush_cache out
      qemu-img: Fix qemu-img convert -obacking_file
      block: Use GCC_FMT_ATTR and fix a format error
      qemu-io: New command map
      Copy snapshots out of QCOW2 disk
      ide: set WCACHE supported in IDENTIFY data
      qcow2: Remove old image creation function
      ...
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 185b93006873e14cb2e33720d5a0c7115972032a
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Fri Oct 22 14:40:31 2010 -0600

    msix: Allow msix_init on a device with existing MSI-X capability
    
    To enable common msix support to be used with pass through devices,
    don't attempt to change the BAR if the device already has an
    MSI-X capability.  This also means we want to pay closer attention
    to the size when we map the msix table page, as it isn't necessarily
    covering the entire end of the BAR.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 013ddf74dd9ac698d0206effdf268c8768959099
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Sat Oct 23 20:05:29 2010 -0200

    qemu-kvm: use upstream msr save/restore code
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit d6d32e5c7092491e280c5c34078721ef148e9333
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Sat Oct 23 20:05:28 2010 -0200

    qemu-kvm: use upstream regs save/restore code
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 037f32543ca2d1915e7859b16060ac075c4bd738
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Sat Oct 23 20:05:27 2010 -0200

    qemu-kvm: use upstream sregs save/restore code
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 5d709bd76683f158cd36376f4aabab59f406ae75
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Sat Oct 23 20:05:26 2010 -0200

    qemu-kvm: use upstream fpu/xsave/xcrs save/restore code
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 0abb7a057d04401247368659d86cd5784086591f
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Sat Oct 23 20:05:25 2010 -0200

    qemu-kvm: kill xsave/xcrs helpers
    
    Use kvm_vcpu_ioctl directly instead.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit e71f08bb4a3f4cb12802208bc7143f2cf482424b
Author: Gleb Natapov <gleb at redhat.com>
Date:   Sun Oct 24 16:32:04 2010 +0200

    Fix cpu/pci hotplug to generate level triggered interrupt.
    
    SCI is level triggered. cpu/pci hotplug should behave appropriately.
    
    Signed-off-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 82915d0c3388fc2c9dc5a47a29fa8f97fdc3c6da
Author: Gleb Natapov <gleb at redhat.com>
Date:   Sun Oct 24 16:32:03 2010 +0200

    Use defines instead of numbers for cpu hotplug
    
    Signed-off-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 061e8895422a982e88e5e6d646b8e293a05dcc61
Author: Gleb Natapov <gleb at redhat.com>
Date:   Sun Oct 24 16:32:02 2010 +0200

    Fix cpu hotplug ioport function registration.
    
    Callback gets pointer to PIIX4PMState as parameter now instead of gpe.
    
    Signed-off-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 401c2d06086c27fa1a7d8b1549cfc7c447f28d64
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Fri Oct 22 13:50:23 2010 -0200

    fix kvm-stub.c typo
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 067f508c43728e08cfd9110a5e74cd4db4fa3a3e
Merge: 9de479a97aeda2820f4408a760d3152a60cc9bb7 18efa4c3abdb6ee932a637900b66c146c3df958d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Fri Oct 22 13:47:58 2010 -0200

    Merge branch 'upstream-merge'
    
    * upstream-merge:
      curses: Fix control-{@[\]^_} and ESC
      kvm: save/restore x86-64 MSRs on x86-64 kernels
      kvm: writeback SMP TSCs on migration only
      kvm: factor out kvm_has_msr_star
      kvm: add save/restore of MSR_VM_HSAVE_PA
      Fix build on !KVM_CAP_MCE
      x86, mce: broadcast mce depending on the cpu version
      x86, mce: ignore SRAO only when MCG_SER_P is available
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 18efa4c3abdb6ee932a637900b66c146c3df958d
Merge: 03dad62368300e9f287ca0cdc5833a5f8737ef82 dbb1413589512574519abcf52a9a7127ddc7844b
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Fri Oct 22 11:57:45 2010 -0200

    Merge commit 'dbb1413589512574519abcf52a9a7127ddc7844b' into upstream-merge
    
    * commit 'dbb1413589512574519abcf52a9a7127ddc7844b':
      curses: Fix control-{@[\]^_} and ESC
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 03dad62368300e9f287ca0cdc5833a5f8737ef82
Merge: 65160cfd3d33e90a718e4bc9524614aae8416956 25d2e3613d159782b66f497184ebdcf3ccb686ab
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Fri Oct 22 11:56:01 2010 -0200

    Merge commit '25d2e3613d159782b66f497184ebdcf3ccb686ab' into upstream-merge
    
    * commit '25d2e3613d159782b66f497184ebdcf3ccb686ab':
      kvm: save/restore x86-64 MSRs on x86-64 kernels
      kvm: writeback SMP TSCs on migration only
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 65160cfd3d33e90a718e4bc9524614aae8416956
Merge: 9de479a97aeda2820f4408a760d3152a60cc9bb7 75b10c43365e2a9cab5398f31b96a463b0d57eff
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Fri Oct 22 11:52:13 2010 -0200

    Merge commit '75b10c43365e2a9cab5398f31b96a463b0d57eff' into upstream-merge
    
    * commit '75b10c43365e2a9cab5398f31b96a463b0d57eff':
      kvm: factor out kvm_has_msr_star
      kvm: add save/restore of MSR_VM_HSAVE_PA
      Fix build on !KVM_CAP_MCE
      x86, mce: broadcast mce depending on the cpu version
      x86, mce: ignore SRAO only when MCG_SER_P is available
    
    Conflicts:
    	target-i386/kvm.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 9de479a97aeda2820f4408a760d3152a60cc9bb7
Merge: bd8b215bce453706c3951460cc7e6627ccb90314 81b2246a4a2874f61a157588fb14cd2de381b9f4
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Oct 21 11:19:36 2010 -0200

    Merge branch 'upstream-merge'
    
    * upstream-merge: (31 commits)
      Fix pci hotplug to generate level triggered interrupt.
      Use defines instead of numbers for pci hotplug sts bit
      Add savevm/loadvm support for MCE
      MCE: Relay UCR MCE to guest
      Add RAM -> physical addr mapping in MCE simulation
      Export qemu_ram_addr_from_host
      kvm: x86: add mce support
      Add svm cpuid features
      Fix memory leak in register save load due to xsave support
      iothread: use signalfd
      Set cpuid definition to 0 before initializing it
      signalfd compatibility
      configure: Support disabling warnings in $gcc_flags
      tcg: Fix compiler error (comparison of unsigned expression)
      wacom tablet: activate event handlers.
      vmmouse: adapt to mouse handler changes.
      [virtio-9p] Add support to v9fs_string_alloc_printf() for handling %lu.
      [virtio-9p] Use preadv/pwritev instead of readv/writev
      [virtio-9p] Qemu 9p commandline options validity checks
      virtio-9p: Support mapped posix acl
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 81b2246a4a2874f61a157588fb14cd2de381b9f4
Merge: d0f192b0eed6dac8efca49b78be53e9cdc27564c 633aa0acfe2c4d3e56acfe28c912796bf54de6d3
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:42:57 2010 -0200

    Merge commit '633aa0acfe2c4d3e56acfe28c912796bf54de6d3' into upstream-merge
    
    * commit '633aa0acfe2c4d3e56acfe28c912796bf54de6d3':
      Fix pci hotplug to generate level triggered interrupt.
      Use defines instead of numbers for pci hotplug sts bit
      Fix memory leak in register save load due to xsave support
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit d0f192b0eed6dac8efca49b78be53e9cdc27564c
Merge: 0dd621a21d2870d6e15a7d12823528aaa397779a 577804958ae8ea40b630bc820b72c33f37b01e81
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:40:37 2010 -0200

    Merge commit '577804958ae8ea40b630bc820b72c33f37b01e81' into upstream-merge
    
    * commit '577804958ae8ea40b630bc820b72c33f37b01e81':
      Add savevm/loadvm support for MCE
    
    Conflicts:
    	target-i386/kvm.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 0dd621a21d2870d6e15a7d12823528aaa397779a
Merge: 57c2f8b056a0879236f6e55500eb6569c9a5e7f4 c0532a76b407af4b276dc5a62d8178db59857ea6
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:37:59 2010 -0200

    Merge commit 'c0532a76b407af4b276dc5a62d8178db59857ea6' into upstream-merge
    
    * commit 'c0532a76b407af4b276dc5a62d8178db59857ea6':
      MCE: Relay UCR MCE to guest
    
    Conflicts:
    	kvm-stub.c
    	target-i386/kvm.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 57c2f8b056a0879236f6e55500eb6569c9a5e7f4
Merge: fe83cfe7db41a889aa95651750da4d5d9723e853 983dfc3b135de0a4808a41a8ca71e1809ba6a62e
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:21:46 2010 -0200

    Merge commit '983dfc3b135de0a4808a41a8ca71e1809ba6a62e' into upstream-merge
    
    * commit '983dfc3b135de0a4808a41a8ca71e1809ba6a62e':
      Add RAM -> physical addr mapping in MCE simulation
    
    Conflicts:
    	kvm.h
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit fe83cfe7db41a889aa95651750da4d5d9723e853
Merge: 250968666b4984f5f6e91bd3358f21187aea8ad8 e890261f671a0573efbc024972d8769423fc82fc
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:19:46 2010 -0200

    Merge commit 'e890261f671a0573efbc024972d8769423fc82fc' into upstream-merge
    
    * commit 'e890261f671a0573efbc024972d8769423fc82fc':
      Export qemu_ram_addr_from_host
    
    Conflicts:
    	cpu-common.h
    	exec.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 250968666b4984f5f6e91bd3358f21187aea8ad8
Merge: b4f09f67956e74367d3ba35137985bb9fc314842 e7701825e17d74913b0f1585d523cedaf1d6632a
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 21:16:24 2010 -0200

    Merge commit 'e7701825e17d74913b0f1585d523cedaf1d6632a' into upstream-merge
    
    * commit 'e7701825e17d74913b0f1585d523cedaf1d6632a':
      kvm: x86: add mce support
      iothread: use signalfd
      signalfd compatibility
    
    Conflicts:
    	target-i386/kvm.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit b4f09f67956e74367d3ba35137985bb9fc314842
Merge: 602b489d8a02f6a870899116703c4b078b9f6f20 296acb643b0f7ec3ab3d8c4a8fc48039d9269818
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 20:54:03 2010 -0200

    Merge commit '296acb643b0f7ec3ab3d8c4a8fc48039d9269818' into upstream-merge
    
    * commit '296acb643b0f7ec3ab3d8c4a8fc48039d9269818':
      Add svm cpuid features
      Set cpuid definition to 0 before initializing it
      configure: Support disabling warnings in $gcc_flags
      tcg: Fix compiler error (comparison of unsigned expression)
      wacom tablet: activate event handlers.
      vmmouse: adapt to mouse handler changes.
      [virtio-9p] Add support to v9fs_string_alloc_printf() for handling %lu.
      [virtio-9p] Use preadv/pwritev instead of readv/writev
      [virtio-9p] Qemu 9p commandline options validity checks
      virtio-9p: Support mapped posix acl
      virtio-9p: Use layered xattr approach
      [virtio-9p] Ignore O_DIRECT hint from client.
      qemu-virtio-9p: Implement TREADLINK operation for 9p2000.L
      [virtio-9p] Introduce server side TFSYNC/RFSYNC for dotl
      qemu-virtio9p: Implement TGETLOCK
      [virto-9p] Implement TLOCK
      [virtio-9p] open should not return EBADF
      trace: improve info trace output
      trace: Format strings must begin/end with double quotes
    
    Conflicts:
    	target-i386/cpuid.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 602b489d8a02f6a870899116703c4b078b9f6f20
Merge: bd8b215bce453706c3951460cc7e6627ccb90314 d8023f311499e06c02b4da7e74388d7ad906ea23
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Oct 20 20:46:05 2010 -0200

    Merge commit 'd8023f311499e06c02b4da7e74388d7ad906ea23' into upstream-merge
    
    * commit 'd8023f311499e06c02b4da7e74388d7ad906ea23':
      apic: convert debug printf statements to tracepoints
      trace: Relax trace-events parsing regex in simpletrace.py
    
    Conflicts:
    	hw/apic.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit bd8b215bce453706c3951460cc7e6627ccb90314
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Wed Oct 20 07:09:37 2010 +0200

    msix: fix irqchip breakage
    
    msix.c doesn't include linux kvm header anymore, so
    IRQCHIP macro is never defined, which resulted in
    a broken msix support. As a fix, stub out kvm_set_irq
    and remove the remaining ifdefs.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 763a04a920f1098e57ad6b46c91c3e531adc961d
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Wed Oct 20 06:50:18 2010 +0200

    msix: fix crash on msix_irq_entries access
    
    Since commit 889e30cc18e21f2091b77267dca8096d7dd34f8b,
    msix.c doesn't include kvm/h anymore, so KVM_IRQCHIP
    is never defined, and msix_irq_entries ends up as NULL.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 10d3a1449b042de7a18291e2bc27ff4d7dea97eb
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 12:05:50 2010 -0200

    qemu-kvm: drop kvm-tpr-opt BIOS region hack
    
    Commit c2333d898b52 changed kvm-tpr-opt.c to use
    cpu_physical_memory_write_rom for BIOS patching.
    
    BIOS map at 0xf0000 can now be registered as IO_MEM_ROM.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 244fb1e5824603d3c934f96d5a2f46d98a54e9bd
Merge: 30fe6cbfe403f056854c5ca3b7c3b3255de299b2 9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:53:29 2010 -0200

    Merge branch 'upstream-merge'
    
    * upstream-merge: (102 commits)
      issue snd_pcm_start() when capturing audio
      fix 100% CPU load when idle with ALSA
      trace: print a warning if user tries to enable an unknown trace event
      mips: avoid write only variables
      ppc: avoid write only variables
      i386: avoid a write only variable
      vnc: avoid write only variables
      cris: avoid a write only variable
      Delete write only variables
      ppc: remove video.x
      lsi53c895a: avoid a write only variable
      eepro100: initialize a variable in all cases
      cirrus: avoid write only variables
      block: avoid a write only variable
      trace: remove timestamp files when cleaning up
      configure: Send error message from spice check to /dev/null
      win32: Set unbuffered stdout
      .gitignore: Ignore *-timestamp
      acpi: Fix an infinite loop in acpi_table_add
      configure: Remove unneeded defines from checks
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 9d5b3ab9fdad6d53af301c5fccf0a7201f961ee0
Merge: 9fda9b64c67ba6b87acd485ed25d6f1fa9f233f1 38cc9b607f85017b095793cab6c129bc9844f441
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:50:57 2010 -0200

    Merge commit '38cc9b607f85017b095793cab6c129bc9844f441' into upstream-merge
    
    * commit '38cc9b607f85017b095793cab6c129bc9844f441': (44 commits)
      issue snd_pcm_start() when capturing audio
      fix 100% CPU load when idle with ALSA
      trace: print a warning if user tries to enable an unknown trace event
      mips: avoid write only variables
      ppc: avoid write only variables
      i386: avoid a write only variable
      vnc: avoid write only variables
      cris: avoid a write only variable
      Delete write only variables
      ppc: remove video.x
      lsi53c895a: avoid a write only variable
      eepro100: initialize a variable in all cases
      cirrus: avoid write only variables
      block: avoid a write only variable
      trace: remove timestamp files when cleaning up
      configure: Send error message from spice check to /dev/null
      win32: Set unbuffered stdout
      .gitignore: Ignore *-timestamp
      acpi: Fix an infinite loop in acpi_table_add
      configure: Remove unneeded defines from checks
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 9fda9b64c67ba6b87acd485ed25d6f1fa9f233f1
Merge: 9d955a47e38d0b479d4670b76da5235d407861a6 54dd932128ae08d6a5a6668551508e30520b0f86
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:48:14 2010 -0200

    Merge commit '54dd932128ae08d6a5a6668551508e30520b0f86' into upstream-merge
    
    * commit '54dd932128ae08d6a5a6668551508e30520b0f86':
      virtio: change set guest notifier to per-device
      eepro100: Add support for multiple individual addresses (multiple IA)
    
    Conflicts:
    	hw/virtio-pci.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 9d955a47e38d0b479d4670b76da5235d407861a6
Merge: 89ed5c8564250d84eb3071abdcc8bba6e326901e afbaa7b4382faced3c364606a5e5d5389462147b
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:43:46 2010 -0200

    Merge commit 'afbaa7b4382faced3c364606a5e5d5389462147b' into upstream-merge
    
    * commit 'afbaa7b4382faced3c364606a5e5d5389462147b': (24 commits)
      virtio-net: unify vhost-net start/stop
      virtio: invoke set_status callback on reset
      net: delay freeing peer host device
      console: Avoid dereferencing NULL active_console
      exec: Fix compilation error for debug code
      rc4030: Fix compilation error in debug code
      mipsnet: Fix compiler warning in debug code
      block/vvfat: Fix compiler warning in debug code
      virtio-9p: Use GCC_FMT_ATTR and fix a format warning
      blockdev: Use GCC_FMT_ATTR (format checking)
      Use GCC_FMT_ATTR (format checking)
      Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)
      slirp: Silence warning on Haiku
      tap: Add stub for Haiku
      nbd: Haiku has _IO() in its BSD compatibility layer
      Haiku doesn't have libm
      configure: Don't rely on special pthreads library
      configure: Add basic support for Haiku
      trace: avoid unnecessary recompilation if nothing changed
      Makefile: fix config-devices.mak generation
      ...
    
    Conflicts:
    	hw/virtio-net.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 89ed5c8564250d84eb3071abdcc8bba6e326901e
Merge: 90914eb4d980cec24acccaa816b1992b7acf47bc cd4ec0b4d169faba8cc03a16b361700e32a83bd6
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:38:43 2010 -0200

    Merge commit 'cd4ec0b4d169faba8cc03a16b361700e32a83bd6' into upstream-merge
    
    * commit 'cd4ec0b4d169faba8cc03a16b361700e32a83bd6':
      add spice into the configure file
    
    Conflicts:
    	configure
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 90914eb4d980cec24acccaa816b1992b7acf47bc
Merge: 4ebd2711c3baa6a78d3a4521b146ac522c238d14 da1d85e339730effd889978be5ae2caadd01bfa9
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:33:01 2010 -0200

    Merge commit 'da1d85e339730effd889978be5ae2caadd01bfa9' into upstream-merge
    
    * commit 'da1d85e339730effd889978be5ae2caadd01bfa9':
      configure: add logging
      add pflib: PixelFormat conversion library.
      Use machine_init() to register virtfs config options.
      Use display types for local display only.
    
    Conflicts:
    	configure
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4ebd2711c3baa6a78d3a4521b146ac522c238d14
Merge: 32bb25e8792d248db1836ae68edf8815cb1b75e5 30f5041ef1ba534af9308d840bf359a50597ba5d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 15:16:11 2010 -0200

    Merge commit '30f5041ef1ba534af9308d840bf359a50597ba5d' into upstream-merge
    
    * commit '30f5041ef1ba534af9308d840bf359a50597ba5d': (23 commits)
      Monitor: Drop QMP info from the qemu-monitor.hx file
      QMP: Small cleanup in handle_qmp_command()
      QMP: Simplify do_info_commands()
      QMP: Introduce query commands dispatch table
      QMP: Introduce command dispatch table
      QMP: Introduce qmp_find_cmd()
      Monitor: Introduce the qmp-commands.hx file
      Monitor: Convert do_info() back to HMP
      Monitor: Drop is_async_return()
      Monitor: Drop QMP bits from do_info()
      QMP: Don't use do_info()
      QMP: handle_qmp_command(): Move 'cmd' sanity check
      Monitor: Introduce search_dispatch_table()
      disable guest-provided stats on "info balloon" command
      Add option to turn on JSON pretty printing in monitor
      Add support for JSON pretty printing
      powerpc: Add a virtex5 ml507 refdesign board
      powerpc: Add a ppc-440x5 Xilinx model
      tap: Remove double include of util.h
      pulse-audio: fix bug on updating rpos
      ...
    
    Conflicts:
    	qemu-monitor.hx
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 32bb25e8792d248db1836ae68edf8815cb1b75e5
Merge: 30fe6cbfe403f056854c5ca3b7c3b3255de299b2 e78815a554adaa551d62a71be10ee2fcf128e473
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 14:51:05 2010 -0200

    Merge commit 'e78815a554adaa551d62a71be10ee2fcf128e473' into upstream-merge
    
    * commit 'e78815a554adaa551d62a71be10ee2fcf128e473':
      Introduce qemu_madvise()
      powerpc: Make the decr interrupt type overridable
      powerpc: Improve emulation of the BookE MMU
      fmopl: workaround for -Wempty-body
    
    Conflicts:
    	configure
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 30fe6cbfe403f056854c5ca3b7c3b3255de299b2
Merge: ba43f0349fc5fbd44b842b2514e5aa2ad276d534 0d797e7ff45efb7034dd889123a52526a1dc50d1
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Oct 18 14:44:53 2010 -0200

    Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu-kvm
    
    * 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu-kvm:
      msix: factor out mask notifier code
      vhost: error code
      vhost: fix up irqfd support
      virtio-net: unify vhost-net start/stop
      virtio: invoke set_status callback on reset
    
    Conflicts:
    	hw/msix.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit ba43f0349fc5fbd44b842b2514e5aa2ad276d534
Author: Avi Kivity <avi at redhat.com>
Date:   Mon Sep 20 15:34:37 2010 +0200

    Move msix.o build back to Makefile.objs
    
    Now that hw/msix.c does not depend on CONFIG_KVM, remove it from
    Makefile.target and put it back in Makefile.objs.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 889e30cc18e21f2091b77267dca8096d7dd34f8b
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 15:58:41 2010 +0200

    msix: remove CONFIG_KVM depedency
    
    Now that the kvm support is properly stubbed, we can build the msix/kvm glue
    unconditionally.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 313bcfc3149a3528a1af65bce7df6420013344a4
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 16:28:24 2010 +0200

    kvm: allow kvm.h to be included from target independent files
    
    - don't include qemu-kvm.h when NEED_CPU_H not defined
    - move a couple of declarations around
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 37859f054986fab6b4094cd5950266ae56a6ca6a
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 15:57:31 2010 +0200

    kvm: Add stubs for msix support code
    
    To allow msix to build without kvm support, add stubs for these functions.
    Move the declarations to kvm.h so they are accessible when kvm support is not
    built.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 4588b981b29544067476bb1963992e4f8bafdcef
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 15:50:50 2010 +0200

    Avoid use of kvm_irq_routing_entry in hw/msix.c
    
    kvm_irq_routing_entry cannot be used when CONFIG_KVM is disabled; add a new
    interface to the kvm support code that uses scalars instead.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 68d5b08a361d95c4d674b830455f19a407b9195c
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 15:26:49 2010 +0200

    Avoid using kvm_irq_routing_entry in PCIDevice
    
    This structure is not available when !CONFIG_KVM.  While an incomplete type
    works if it's not used, you can't do address arithmetic on it.
    
    Use a new type kvm_msix_message instead.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit b4cf54c95b1a3b16573eaa669ae37537e4d83083
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 10 13:12:38 2010 +0200

    kvm: drop kvm_context parameter from msix-related kvm functions
    
    The kvm_context parameter serves no useful purpose since it's a global (and
    all callers reference that global); on the other hand it prevents the build
    when kvm is not configured in since the kvm_context symbol is not defined.
    
    Remove the parameter and replace it by the global kvm_context in callees.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 4b209b225baa36a5d7c90e45589a75f9a1895df4
Author: Avi Kivity <avi at redhat.com>
Date:   Mon Sep 20 13:07:43 2010 +0200

    msix: avoid leaking kvm data on init failure
    
    Move initialization after we're certain to succeed, so we don't leak
    memory on failure.
    
    Acked-by: Michael S. Tsirkin <mst at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 85566812a4f8cae721fea0224e05a7e75c08c5dd
Author: Huang Ying <ying.huang at intel.com>
Date:   Fri Oct 8 16:25:14 2010 +0800

    Fix SRAO/SRAR MCE injecting on guest without MCG_SER_P
    
    On real machine, if MCG_SER_P in MSR_MCG_CAP is not set, SRAO/SRAR MCE
    should not be raised by hardware. This patch makes QEMU-KVM to follow
    the same rule.
    
    Reported-and-Reviewed-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Huang Ying <ying.huang at intel.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 0d797e7ff45efb7034dd889123a52526a1dc50d1
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Thu Oct 7 11:58:08 2010 +0200

    msix: factor out mask notifier code
    
    Move some common code handling msix mask notifiers to a function.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit 77780bc1d1953fb0671f9cac576eeae9dfe6f687
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Wed Oct 6 12:33:00 2010 -0400

    vhost: error code
    
    fix up errors returned to include errno, not just -1
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit c9646bee60f419f76181ab4d1d094afa193834a3
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Wed Oct 6 07:22:00 2010 +0200

    vhost: fix up irqfd support
    
    vhost irqfd support: case where many vqs are
    mapped to a single msix vector is currently broken.
    Fix it up.
    
    	Includes this patch from qemu.git:
    
    virtio: change set guest notifier to per-device
    
    When using irqfd with vhost-net to inject interrupts,
    a single evenfd might inject multiple interrupts.
    Implementing this is much easier with a single
    per-device callback to set guest notifiers.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit df2bda4e858a176ff9335e1e391fbc4213cfe062
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Mon Sep 27 18:20:23 2010 +0200

    virtio-net: unify vhost-net start/stop
    
    Move all of vhost-net start/stop logic to a single routine,
    and call it from everywhere.
    
    Additionally, start/stop vhost-net on link up/down:
    we should not transmit anything if user asked us to
    put the link down.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit 8624fdd8806c3cbd56163533b1578e1c9a78f543
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Mon Sep 27 18:18:52 2010 +0200

    virtio: invoke set_status callback on reset
    
    As status is set to 0 on reset, invoke the
    relevant callback. This makes for a cleaner
    code in devices as they don't need to
    duplicate the code in their reset routine,
    as well as excercises this path a little more.
    
    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>

commit 576af1b5f5524ca0d6587ae43e395313c14059bb
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Oct 4 15:26:30 2010 -0600

    device-assignment: Allow PCI to manage the option ROM
    
    We don't need to duplicate PCI code for mapping and managing the
    option ROM for an assigned device.  We're already using an in-memory
    copy of the ROM, so we can simply fill the contents from the physical
    device and pass the rest off to PCI.  As a benefit, we can now make
    use of the rombar and romfile options, which allow us to either hide
    the ROM BAR, or load it from an external file, such as we can do
    with emulated devices.  This is useful if you want to pass through
    and boot from devices that are either missing a physical option ROM
    or don't supply a valid option ROM.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4b785d9624c1127b358d71933bb5ec476a39db25
Author: Alex Williamson <alex.williamson at redhat.com>
Date:   Mon Oct 4 15:26:24 2010 -0600

    PCI: Export pci_map_option_rom()
    
    Allow it to be referenced outside of hw/pci.c so we can register
    option ROM BARs using the default mapping routine.
    
    Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
    Acked-by: Chris Wright <chrisw at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 6574f651de4e7bf3ce47d598c1966a55357a7acf
Author: Dean Nelson <dnelson at redhat.com>
Date:   Wed Oct 6 10:08:19 2010 -0400

    qemu-kvm: Fix calculation of number of entries based on number of mce_banks
    
    The number of mce_banks needs to be multiplied by 4 in order to actually
    reference all of the entries.
    
    Signed-off-by: Dean Nelson <dnelson at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit c2333d898b52a9d64845522f18fd083534dc0a5b
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Oct 5 15:02:34 2010 +0200

    kvm: allow tpr patching to write to write-protected vapic option rom
    
    Now that we allow the bios to write protect option roms, we need to allow
    the tpr patching code to write to this write protected memory.  This means
    using cpu_physical_memory_write_rom() instead of the usual APIs.
    
    Fixes Windows XP without flexpriority.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 74bcdb1c883012291e5c8faead5c6310a735e52d
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Oct 3 12:01:13 2010 +0200

    Revert "p2v monitor command: translate guest physical address to host virtual address"
    
    This reverts commit c3fe515c911b9828d6e3e659ac794cb7dc76cd66; needs to go
    through qemu.git.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit c3fe515c911b9828d6e3e659ac794cb7dc76cd66
Author: Max Asbock <masbock at linux.vnet.ibm.com>
Date:   Fri Oct 1 09:52:25 2010 +0800

    p2v monitor command: translate guest physical address to host virtual address
    
    Add command p2v to translate guest physical address to host virtual
    address.
    
    The p2v command provides one step in a chain of translations from
    guest virtual to guest physical to host virtual to host physical. Host
    physical is then used to inject a machine check error. As a
    consequence the HWPOISON code on the host and the MCE injection code
    in qemu-kvm are exercised.
    
    Signed-off-by: Max Asbock <masbock at linux.vnet.ibm.com>
    Signed-off-by: Jiajia Zheng <jiajia.zheng at intel.com>
    Signed-off-by: Huang Ying <ying.huang at intel.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 6c8578617ed01c915da793ae98017ebd1244a4e1
Author: Shan Hai <haishan.bai at gmail.com>
Date:   Sun Sep 26 17:37:53 2010 +0800

    qemu-kvm: explicit type conversion to avoid compilation failure
    
    The compilation failed using GCC-4.4.1 on mismatched types
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 1dc3bcc45cd3eb0f878b18f4d04401cb9b035b07
Author: Eduardo Habkost <ehabkost at redhat.com>
Date:   Fri Sep 24 14:03:04 2010 -0300

    make-release: don't use --mtime and --transform tar options
    
    Those options are not available on older systems.
    
    Instead of --transform, just create the file inside the expected directory.
    
    Instead of --mtime, use 'touch' to set file mtime before running tar.
    
    Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit c85acba492da6dbe4e1d5c0b97b3558fcb1d1ccd
Author: Eduardo Habkost <ehabkost at redhat.com>
Date:   Fri Sep 24 14:03:03 2010 -0300

    make-release: don't use --tmpdir mktemp option
    
    This allows the script to work on older systems, where 'mktemp --tmpdir' is not
    available.
    
    Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit fd6bfef3d49a62b36092f131690de3e34f84662d
Author: Bernhard Kohl <bernhard.kohl at nsn.com>
Date:   Tue Sep 14 15:51:40 2010 +0200

    qemu-kvm-x86: consider the irq0override flag in kvm_arch_init_irq_routing
    
    The setting of the irq0override flag must be also passed properly
    to the KVM_IRQCHIP_IOAPIC.
    
    Signed-off-by: Bernhard Kohl <bernhard.kohl at nsn.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit dd67374ebb2f404b1b4b8e1abb1d189a7aff7f4c
Merge: aa85bd8b64ee49f99961e6c4d5ed9e0fcb913ac1 09cc81988ff2ce037522e18f1b524afd2c938bb6
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 18:16:26 2010 -0300

    Merge branch 'upstream-merge'
    
    * upstream-merge: (154 commits)
      Move macros GCC_ATTR and GCC_FMT_ATTR to common header file
      Fix OpenBSD build
      block-verify: fix 32-bit build
      Fix compilation error (missing include statement)
      mips_malta: Fix format strings
      mips_fulong2e: Fix format strings
      trace: Fix user emulator dependency on trace objects
      blkverify: Add block driver for verifying I/O
      scsi_bus: fix length and xfer_mode for RESERVE and RELEASE commands
      scsi-generic: add missing reset handler
      qcow2: Avoid bounce buffers for AIO write requests
      qcow2: Avoid bounce buffers for AIO read requests
      cutils: qemu_iovec_copy and qemu_iovec_memset
      ide: propagate the required alignment
      scsi-disk: propagate the required alignment
      virtio-blk: propagate the required alignment
      qcow2: Get rid of additional sync on COW
      qcow2: Move sync out of qcow2_alloc_clusters
      qcow2: Move sync out of update_refcount
      qcow2: Move sync out of write_refcount_block_entries
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 09cc81988ff2ce037522e18f1b524afd2c938bb6
Merge: e1484cdeae83253e1ae743855710c1d2ced75ec6 9c9e7d51bf01afdd4902bc9832c4a6ec19f68d0b
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 18:15:28 2010 -0300

    Merge commit '9c9e7d51bf01afdd4902bc9832c4a6ec19f68d0b' into upstream-merge
    
    * commit '9c9e7d51bf01afdd4902bc9832c4a6ec19f68d0b': (31 commits)
      Move macros GCC_ATTR and GCC_FMT_ATTR to common header file
      Fix OpenBSD build
      block-verify: fix 32-bit build
      Fix compilation error (missing include statement)
      mips_malta: Fix format strings
      mips_fulong2e: Fix format strings
      trace: Fix user emulator dependency on trace objects
      blkverify: Add block driver for verifying I/O
      scsi_bus: fix length and xfer_mode for RESERVE and RELEASE commands
      scsi-generic: add missing reset handler
      qcow2: Avoid bounce buffers for AIO write requests
      qcow2: Avoid bounce buffers for AIO read requests
      cutils: qemu_iovec_copy and qemu_iovec_memset
      ide: propagate the required alignment
      scsi-disk: propagate the required alignment
      virtio-blk: propagate the required alignment
      qcow2: Get rid of additional sync on COW
      qcow2: Move sync out of qcow2_alloc_clusters
      qcow2: Move sync out of update_refcount
      qcow2: Move sync out of write_refcount_block_entries
      ...
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit e1484cdeae83253e1ae743855710c1d2ced75ec6
Merge: ecc7eb87fb3a26131df8b0687a5dc5d726428080 6b37c87c96a5b148685e8e6bf09d0aca953cb1a8
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 18:12:04 2010 -0300

    Merge commit '6b37c87c96a5b148685e8e6bf09d0aca953cb1a8' into upstream-merge
    
    * commit '6b37c87c96a5b148685e8e6bf09d0aca953cb1a8':
      vhost: fix infinite loop on error path
    
    Conflicts:
    	hw/vhost_net.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit ecc7eb87fb3a26131df8b0687a5dc5d726428080
Merge: 222f9893f46f194a7183ae1621cb8c39ba8f339d 0b65b9e105ce5bc29d9412e0df476fd0cef3b8e2
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 18:08:43 2010 -0300

    Merge commit '0b65b9e105ce5bc29d9412e0df476fd0cef3b8e2' into upstream-merge
    
    * commit '0b65b9e105ce5bc29d9412e0df476fd0cef3b8e2':
      Use gcc warning flag -Wnested-externs
      Use gcc warning flag -Wempty-body
      Use a few more gcc warning flags
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 222f9893f46f194a7183ae1621cb8c39ba8f339d
Merge: 325e23349d22e6c020dde4f75f93d457dafe1ae6 6e15cb5f6d87d0039b4c1590d1577ae14db17b50
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 17:39:08 2010 -0300

    Merge commit '6e15cb5f6d87d0039b4c1590d1577ae14db17b50' into upstream-merge
    
    * commit '6e15cb5f6d87d0039b4c1590d1577ae14db17b50':
      Use gcc warning flag -Wtype-limits
      pxa2xx: fix SSSR TFN logic
      MIPS: fix yield handling
      PPC: Suppress gcc warnings with -Wtype-limits
      blkdebug: fix enum comparison
      pxa2xx: remove useless checks
      Use range_covers_byte
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 325e23349d22e6c020dde4f75f93d457dafe1ae6
Merge: 1be764b0d34f7e1f169296fd27e5567a5e208849 bf1b00712375bea65f2254dea8281fa646eebbd5
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 17:25:09 2010 -0300

    Merge commit 'bf1b00712375bea65f2254dea8281fa646eebbd5' into upstream-merge
    
    * commit 'bf1b00712375bea65f2254dea8281fa646eebbd5': (36 commits)
      Introduce range.h
      linux-user: improve flatload error checking
      linux-user: fix types in a comparison
      linux-user: fix socklen_t comparisons
      Check for errors during BIOS or kernel load
      Make ARP replies at least 64 bytes long
      Accept packets with TTL=1
      cris: Avoid spurios hw_abort on recursive bus faults
      PPC: Redesign interrupt trigger path
      PPC: Enable hint bits for lwarx/ldarx
      serial: Update parameters after load
      Remove wrong semicolon in macro definition
      serial: Wrap debug prints around a DPRINTF macro
      ESP: fix ESP DMA access when DMA is not enabled
      powerpc: Avoid TLB related log spamming
      trace: fix a regex portability problem
      trace: fix a typo
      HACKING: add rules for printf-like functions
      HACKING: add string management rules
      HACKING: add memory management rules
      ...
    
    Conflicts:
    	hw/msix.c
    	hw/piix_pci.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 1be764b0d34f7e1f169296fd27e5567a5e208849
Merge: aa85bd8b64ee49f99961e6c4d5ed9e0fcb913ac1 22890ab5e825601f4c3d5a1a6b4197904e5d1fee
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 23 17:21:16 2010 -0300

    Merge commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee' into upstream-merge
    
    * commit '22890ab5e825601f4c3d5a1a6b4197904e5d1fee': (76 commits)
      trace: Support for dynamically enabling/disabling trace events
      trace: Add simple built-in tracing backend
      trace: Add trace-events file for declaring trace events
      microblaze: Add support for fcmp.un
      elf: Calculate symbol size if needed
      Fix OpenBSD build warning
      microblaze: User-mode emulation of hw-excp signals
      microblaze: Add basic FPU emulation
      microblaze: Add definitions for FSR reg fields
      Revert "Make default invocation of block drivers safer (v3)"
      Revert "PPC: Qdev'ify e500 pci"
      Revert "PPC: Make e500 pci byte swap config data"
      virtio-9p: Change handling of flags in open() path for 9P2000.L
      [virtio-9p] This patch implements TLERROR/RLERROR on the qemu 9P server.
      [virtio-9p] Remove all instances of unnecessary dotu variable.
      virtio-9p: Add support for removing xattr
      virtio-9p: Fix the memset usage
      virtio-9p: Use lchown which won't follow symlink
      virtio-9p: Add SM_NONE security model
      virtio-9p: Hide user.virtfs xattr in case of mapped security.
      ...
    
    Conflicts:
    	monitor.c
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit aa85bd8b64ee49f99961e6c4d5ed9e0fcb913ac1
Author: Gleb Natapov <gleb at redhat.com>
Date:   Tue Sep 21 14:31:42 2010 +0200

    support piix PAM registers in KVM
    
    Without this BIOS fails to remap 0xf0000 memory from ROM to RAM so writes
    to F-segment modify ROM content instead of memory copy. Since QEMU does
    not reloads ROMs during reset on next boot modified copy of BIOS is used.
    
    Signed-off-by: Gleb Natapov <gleb at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit ee8a3368702909a85d78a9e1a140ad20ef99e071
Author: Avi Kivity <avi at redhat.com>
Date:   Mon Sep 20 13:01:50 2010 +0200

    Remove qemu-kvm-helper.c
    
    No longer used.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit a05684e367d4eb6809a25eaaea8d83eb6f8cf6c2
Author: Huang Ying <ying.huang at intel.com>
Date:   Sun Sep 19 09:00:33 2010 +0800

    Add RAM -> physical addr mapping in MCE simulation
    
    In QEMU-KVM, physical address != RAM address. While MCE simulation
    needs physical address instead of RAM address. So
    kvm_physical_memory_addr_from_ram() is implemented to do the
    conversion, and it is invoked before being filled in the IA32_MCi_ADDR
    MSR.
    
    Reported-by: Dean Nelson <dnelson at redhat.com>
    Signed-off-by: Huang Ying <ying.huang at intel.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 2f48918f8aaedcd6ab2b637f63927077973a54c7
Author: Avi Kivity <avi at redhat.com>
Date:   Mon Sep 13 19:52:39 2010 +0200

    Rename KVM_UPSTREAM to OBSOLETE_KVM_IMPL
    
    The symbol KVM_UPSTREAM is used to mark sections of code that are part of
    the upstream kvm implemetation that is not used in qemu-kvm.  However the
    name becomes ambiguous if qemu-kvm is merged upstream.
    
    Rename the symbol to avoid confusion.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 945b6fa1a023e6eb858489bd58e7d786fdc53a32
Author: Avi Kivity <avi at redhat.com>
Date:   Mon Sep 13 19:42:25 2010 +0200

    Remove kvm/doxygen.conf
    
    Unused.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 6ab42e983a73de460159f6dbf0c340dc5724d643
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 12 09:50:56 2010 +0200

    Don't launch guest if -no-kvm when tcg is not configured in
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit bd27a32d82f7ae06a9053d16273ca5ef4b4f13c9
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 12 09:46:51 2010 +0200

    Add missing tcg_prologue_init() for --disable-cpu-emulation build
    
    Add missing tcg_prologue_init() and tcg_ctx, remove code_gen_max_block_size.
    
    Fixes ./configure --disable-cpu-emulation.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit a98963d6a64c0208077a4b296a49ee3756e396b4
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Sep 9 16:16:38 2010 -0300

    Revert "qemu-kvm: drop posix-aio-compat.cs signalfd usage"
    
    This reverts commit cb375ad1a62ba9de0207d144d0ad8ca1bee09d33.
    
    Breaks FC8 32/64 install.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 073e16b6207cc85f1f419e9a90474bbded03bef0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Sep 8 14:45:21 2010 -0300

    Fix "kvm: reset MSR_IA32_CR_PAT correctly" thinkos
    
    Missing break & wrong parameter.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 4c54cb89e163362b4c0fdb64ca20c5c766f08da8
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Sep 7 16:21:22 2010 +0300

    kvm: reset MSR_IA32_CR_PAT correctly
    
    The power-on value of MSR_IA32_CR_PAT is not 0 - that disables cacheing and
    makes everything dog slow.
    
    Fix to reset MSR_IA32_CR_PAT to the correct value.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit cb375ad1a62ba9de0207d144d0ad8ca1bee09d33
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Sep 6 17:20:17 2010 -0300

    qemu-kvm: drop posix-aio-compat.cs signalfd usage
    
    Block SIGUSR2, which makes the signal be handled through qemu-kvm.c's
    signalfd.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 2a0620db650cc12b5a3c932152e43461ad55c5f1
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Mon Sep 6 17:20:16 2010 -0300

    qemu-kvm: use usptream eventfd code
    
    Upstream code is equivalent.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit cff69a4962b19ee99cb95382b6b94fbf2c281539
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 5 15:13:57 2010 +0300

    qemu-kvm.c: add braces where appropriate
    
    Adjust to comply with CODING_STYLE, at least where braces are concerned.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit e11607909b9e6d9e279a451f1ec37ddd9a7c6db3
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 5 15:13:56 2010 +0300

    qemu-kvm-x86.c: add braces where appropriate
    
    Adjust to comply with CODING_STYLE, at least where braces are concerned.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 93572fe6d62bcf733e139f41a3a8fa36232d4d08
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 5 15:13:55 2010 +0300

    qemu-kvm-x86.c: remove extraneous line continuation
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit c7ba1ae2721c2059111cdebd0def6898423aea6e
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 5 15:13:54 2010 +0300

    qemu-kvm-x86.c: reindent
    
    Reindent qemu-kvm-x86.c according to CODING_STYLE.  The original used a mix
    of qemu and linux indentation styles.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>

commit 6ee63ef38696aa3b0518f6aa6b85bc111ba7ca4e
Merge: 6d417770a5e1c039a5df98828b5a3877afaaaed6 ba5e7f82169f32ab8163c707d97c799ca09f8924
Author: Avi Kivity <avi at redhat.com>
Date:   Sun Sep 5 11:23:00 2010 +0300

    Merge branch 'master' of git://git.sv.gnu.org/qemu into next
    
    * 'master' of git://git.sv.gnu.org/qemu:
      vnc: use bswapNN() rather than bswap_NN()
      vnc: tight: remove unused variable
      Fix ivshmem build on 32-bit hosts
      virtio-9p: Make sure -virtfs option works correctly
      hw/ivshmem.c don't check for negative values on unsigned data types
      load_multiboot(): get_image_size() returns int
      Change DPRINTF() to do{}while(0) to avoid compiler warning
      size_t is unsigned, change to ssize_t to handle errors from tight_compress_data()
      Fix repeated typo: was "end if list" instead of "end of list"
      Respect return value from nbd_client()
      Remove unused argument for nbd_client()
      Fix OpenBSD linker warning
      acpi: fix file size check with -acpitable.
      isapc: fix segfault.
      Fix segfault in mmio subpage handling code.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 6d417770a5e1c039a5df98828b5a3877afaaaed6
Author: Avi Kivity <avi at redhat.com>
Date:   Thu Sep 2 16:40:20 2010 +0300

    kvm_stat: increase nfiles resource limit
    
    kvm_stat uses a huge number of files for perf_events, increase resource
    limit so we don't fail.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 94f964d08ebdcc74999d4cff74bc5f7aee84fc55
Author: Avi Kivity <avi at redhat.com>
Date:   Thu Sep 2 14:22:40 2010 +0300

    kvm_stat: determine online cpus dynamically
    
    Instead of hardcoding [0, 1].
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 5bd5f131b50cb373ff4e2a3632c6dad00a1f0b55
Author: Avi Kivity <avi at redhat.com>
Date:   Wed Sep 1 10:16:54 2010 +0300

    kvm_stat: ignore events that have never occured
    
    Less cluttered display.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 6965dde18716c35f1a870ae02d4b5fa6d985eb61
Author: Avi Kivity <avi at redhat.com>
Date:   Wed Sep 1 10:13:50 2010 +0300

    kvm_stat: use total count as a secondary sort key
    
    This shows events with history in preference to events with none.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit d17e452575767705cddee81542e279ca4e913296
Author: Avi Kivity <avi at redhat.com>
Date:   Wed Sep 1 10:01:27 2010 +0300

    kvm_stat: scale delta column to make it a rate
    
    Scale the delta column by 1/sleeptime, so its units are
    events per second.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit ee4461a3d2d3d67dbc938d7d77c874ce80d7d47a
Author: Avi Kivity <avi at redhat.com>
Date:   Wed Sep 1 09:59:50 2010 +0300

    kvm_stat: make the initial sleep shorter
    
    So we can see results faster
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit c1169dfff7014b6cc2a548c19d2875e8d550e575
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 16:22:25 2010 +0300

    kvm_stat: be slower
    
    More information is displayed, so more time is need to process the information.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 0aff501d80e0820e19518fc7b0a3019db335b4cd
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 16:21:49 2010 +0300

    kvm_stat: increase label width
    
    With kvm_exit drill down, labels are pretty large.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit d47d837df169e7cf94f1dd0c3d572bd1a35b9ea0
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 16:20:18 2010 +0300

    kvm_stat: sort tui output according to highest occurence
    
    With plenty of counters and wide, short screens it's hard to see what's on
    the top.  So sort the output.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 7fcaebc9704009ef56bd7aec10c1c198281771db
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 16:13:44 2010 +0300

    kvm_stat: provide detailed kvm_exit:exit_reason display
    
    In addition to displaying kvm_exit as an aggregate counter, use perf_event's
    filter capability to count individual exit reasons.
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit 7f99e80afafdc790a0f467c6c722d8b5e6270845
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 14:08:26 2010 +0300

    kvm_stat: implement tracepoint stats provider
    
    Signed-off-by: Avi Kivity <avi at redhat.com>

commit e0f709582fe88e341438c2828a364060f020761c
Author: Avi Kivity <avi at redhat.com>
Date:   Tue Aug 31 11:35:36 2010 +0300

    kvm_stat: refactor to separate stats provider from difference engine
    
    Signed-off-by: Avi Kivity <avi at redhat.com>



More information about the Spice-commits mailing list