Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-merge
commit51df62225ded6893e7151e33d1ec7a928fe2c1cb
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:39:59 +0000 (28 11:39 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:39:59 +0000 (28 11:39 +0000)
tree1253e326ae37b53930871372dd7b53c1320ac574
parent6ae0acf3d461a6cb6ee164530763b041fbe18ddd
parent59c7b155aa6e1cbfe8a92e2322ea59ab31965c10
Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-merge

* commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10': (81 commits)
  posix-aio-compat: Split out posix_aio_process_queue
  monitor: Convert do_closefd() to QObject
  monitor: Convert do_getfd() to QObject
  monitor: Convert do_eject() to QObject
  monitor: Convert do_pci_device_hot_remove() to QObject
  monitor: Convert do_migrate_cancel() to QObject
  monitor: Convert do_migrate_set_speed() to QObject
  monitor: Convert do_migrate() to QObject
  monitor: Convert do_physical_memory_save() to QObject
  monitor: Convert do_memory_save() to QObject
  lsi_scsi: port to vmstate
  vmstate: Add VMSTATE_BUFFER_UNSAFE
  vmware_vga: port to vmstate
  vmware_vga: the support to change dinamically depth is not there
  vmware_vga: scratch is really an array of uint32_t
  vmware_vga: remove !EMBED_STDVGA code
  vmware_vga: qemu_malloc() returns void *
  vmware_vga: Remove uselss casts from void *
  vmware_vga: Pass pci_vmsga_state_t arg no VGACommonState
  vga: remove unused vga_common_save/load
  ...

Conflicts:
posix-aio-compat.c

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
20 files changed:
hw/e1000.c
hw/eepro100.c
hw/hw.h
hw/ne2000-isa.c
hw/ne2000.c
hw/pc.h
hw/pci-hotplug.c
hw/pci.c
hw/pcnet.c
hw/rtl8139.c
hw/vga-pci.c
hw/vga.c
hw/vga_int.h
monitor.c
posix-aio-compat.c
qemu-config.c
qemu-monitor.hx
savevm.c
sysemu.h
target-i386/machine.c