[v1] hw/isa/piix4: Migrate Reset Control Register

[PATCH] hw/isa/piix4: Migrate Reset Control Register

Philippe Mathieu-Daudé posted 1 patch 3 years, 1 month ago

Diff against v2 v3
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210324142814.609112-1-f4bug@amsat.org

There is a newer version of this series

hw/isa/piix4.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] hw/isa/piix4: Migrate Reset Control Register

Posted by Philippe Mathieu-Daudé 3 years, 1 month ago

Fixes: 5790b757cfb ("piix4: Add the Reset Control Register")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/isa/piix4.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index a50d97834c7..6eeff4525f8 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -95,10 +95,11 @@ static void piix4_isa_reset(DeviceState *dev)
 
 static const VMStateDescription vmstate_piix4 = {
     .name = "PIIX4",
-    .version_id = 2,
-    .minimum_version_id = 2,
+    .version_id = 3,
+    .minimum_version_id = 3,
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(dev, PIIX4State),
+        VMSTATE_UINT8(rcr, PIIX4State),
         VMSTATE_END_OF_LIST()
     }
 };
-- 
2.26.2

Re: [PATCH] hw/isa/piix4: Migrate Reset Control Register

Posted by Dr. David Alan Gilbert 3 years, 1 month ago

* Philippe Mathieu-Daudé (f4bug@amsat.org) wrote:
> Fixes: 5790b757cfb ("piix4: Add the Reset Control Register")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

So if I understand correctly, piix4 is only used on one of the MIPS
machines, so that bumping the version here won't break anyone who
cares about backwards migration; in which case from a migration point of
view:


Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  hw/isa/piix4.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index a50d97834c7..6eeff4525f8 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -95,10 +95,11 @@ static void piix4_isa_reset(DeviceState *dev)
>  
>  static const VMStateDescription vmstate_piix4 = {
>      .name = "PIIX4",
> -    .version_id = 2,
> -    .minimum_version_id = 2,
> +    .version_id = 3,
> +    .minimum_version_id = 3,
>      .fields = (VMStateField[]) {
>          VMSTATE_PCI_DEVICE(dev, PIIX4State),
> +        VMSTATE_UINT8(rcr, PIIX4State),
>          VMSTATE_END_OF_LIST()
>      }
>  };
> -- 
> 2.26.2
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK