From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>,
qemu-devel@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH v3] hw/isa/piix4: Migrate Reset Control Register
Date: Thu, 25 Mar 2021 18:41:37 +0000 [thread overview]
Message-ID: <YFzZYc76S0wc11KB@work-vm> (raw)
In-Reply-To: <20210324200334.729899-1-f4bug@amsat.org>
* Philippe Mathieu-Daudé (f4bug@amsat.org) wrote:
> 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>
Yep, that's better.
(Note you could also use a pre_load that might be a little simpler,
but not much in it).
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> v3: Use VMSTATE_UINT8_V (Dave)
> v2: Add piix4_ide_post_load() and describe
> ---
> hw/isa/piix4.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index a50d97834c7..b3b6a4378a3 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()
> }
> };
> --
> 2.26.2
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
prev parent reply other threads:[~2021-03-25 18:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 20:03 [PATCH v3] hw/isa/piix4: Migrate Reset Control Register Philippe Mathieu-Daudé
2021-03-25 18:41 ` Dr. David Alan Gilbert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YFzZYc76S0wc11KB@work-vm \
--to=dgilbert@redhat.com \
--cc=aurelien@aurel32.net \
--cc=f4bug@amsat.org \
--cc=hpoussin@reactos.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).