From 8faaf42a4c2f8a16cae315abb366d92c6d370684 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 3 Feb 2011 22:54:13 +0100 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori (cherry picked from commit 5dce499948e4a4abe62f010baf4a7ed3d49e53cb) --- hw/ioapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ioapic.c b/hw/ioapic.c index 8c46c1dfd..fb3d17329 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() -- 2.39.5