diff options
author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-03-24 14:54:43 +0100 |
---|---|---|
committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-04-13 12:06:59 +0200 |
commit | 62271205bcfaee440d06c06060ee79dac657caff (patch) | |
tree | a213a2671527ad6bb58ca83fa3ad52eaed12fc55 /hw/isa/piix4.c | |
parent | 50fab4cc672233fee22fff2cf51543af57602c7d (diff) | |
download | qemu-62271205bcfaee440d06c06060ee79dac657caff.zip qemu-62271205bcfaee440d06c06060ee79dac657caff.tar.gz qemu-62271205bcfaee440d06c06060ee79dac657caff.tar.bz2 |
hw/isa/piix4: Migrate Reset Control Register
When adding the Reset register in commit 5790b757cfb we
forgot to migrate it.
While it is possible a VM using the PIIX4 is migrated just
after requesting a system shutdown, it is very unlikely.
However when restoring a migrated VM, we might have the
RCR bit #4 set on the stack and when the VM resume it
directly shutdowns.
Add a post_load() migration handler and set the default
RCR value to 0 for earlier versions, assuming the VM was
not going to shutdown before migration.
Fixes: 5790b757cfb ("piix4: Add the Reset Control Register")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210324200334.729899-1-f4bug@amsat.org>
Diffstat (limited to 'hw/isa/piix4.c')
-rw-r--r-- | hw/isa/piix4.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index a50d978..b3b6a43 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -93,12 +93,25 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xae] = 0x00; } +static int piix4_ide_post_load(void *opaque, int version_id) +{ + PIIX4State *s = opaque; + + if (version_id == 2) { + s->rcr = 0; + } + + return 0; +} + static const VMStateDescription vmstate_piix4 = { .name = "PIIX4", - .version_id = 2, + .version_id = 3, .minimum_version_id = 2, + .post_load = piix4_ide_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIX4State), + VMSTATE_UINT8_V(rcr, PIIX4State, 3), VMSTATE_END_OF_LIST() } }; |