diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-02-03 22:54:13 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-04 06:33:26 -0600 |
| commit | 5dce499948e4a4abe62f010baf4a7ed3d49e53cb (patch) | |
| tree | 4ed7d99728f01b701663f6066636cf74751c95e2 | |
| parent | 35a74c5c5941b474d8b985237e1bde0b8cd2a20f (diff) | |
| download | qemu-5dce499948e4a4abe62f010baf4a7ed3d49e53cb.zip qemu-5dce499948e4a4abe62f010baf4a7ed3d49e53cb.tar.gz qemu-5dce499948e4a4abe62f010baf4a7ed3d49e53cb.tar.bz2 | |
ioapic: Add support for qemu-kvm's vmstate v2
qemu-kvm carries the IOAPIC base address in its v2 vmstate. We only
support the default base address so far, and saving even that in the
device state was rejected.
Add a padding field to be able to read qemu-kvm's old state, but
increase our version to 3, indicating that we are not saving a valid
address. This also gives downstream the chance to change to stop
evaluating the base_address and move to v3 as well.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/ioapic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ioapic.c b/hw/ioapic.c index 8c46c1d..fb3d173 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -244,13 +244,14 @@ static int ioapic_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_ioapic = { .name = "ioapic", - .version_id = 2, + .version_id = 3, .post_load = ioapic_post_load, .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { VMSTATE_UINT8(id, IOAPICState), VMSTATE_UINT8(ioregsel, IOAPICState), + VMSTATE_UNUSED_V(2, 8), /* to account for qemu-kvm's v2 format */ VMSTATE_UINT32_V(irr, IOAPICState, 2), VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS), VMSTATE_END_OF_LIST() |