diff options
| author |   Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:39:59 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2009-10-28 11:39:59 +0000 |
| commit | 51df62225ded6893e7151e33d1ec7a928fe2c1cb (patch) | |
| tree | 1253e326ae37b53930871372dd7b53c1320ac574 /target-i386/machine.c | |
| parent | Merge commit '844e78ef9c6102cc3e33e4aa00efc8abdf0d8dde' into upstream-merge (diff) | |
| parent | posix-aio-compat: Split out posix_aio_process_queue (diff) | |
| download | qemu-kvm-51df62225ded6893e7151e33d1ec7a928fe2c1cb.tar.gz qemu-kvm-51df62225ded6893e7151e33d1ec7a928fe2c1cb.tar.bz2 qemu-kvm-51df62225ded6893e7151e33d1ec7a928fe2c1cb.zip | |
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>
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index f6fdc9ddd..2b88fea63 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -315,7 +315,7 @@ static const VMStateInfo vmstate_hack_uint64_as_uint32 = { }; #define VMSTATE_HACK_UINT32(_f, _s, _t) \ - VMSTATE_SINGLE_TEST(_f, _s, _t, vmstate_hack_uint64_as_uint32, uint64_t) + VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_hack_uint64_as_uint32, uint64_t) #endif static void cpu_pre_save(void *opaque) |