[Qemu-devel] [PATCH] Fix ioapic vmstate

[Qemu-devel] [PATCH] Fix ioapic vmstate

[Pavel Dovgaluk]

  This patch fixes save/restore vmstate of IOAPIC.
  When irr member of IOAPICState is not saved and loaded,
restoring becomes non-deterministic, because irr is kept from
state of VM that was before loading.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>
---
 hw/ioapic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/ioapic.c b/hw/ioapic.c
index 2109568..e583284 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -207,6 +207,7 @@ static const VMStateDescription vmstate_ioapic = {
     .fields      = (VMStateField []) {
         VMSTATE_UINT8(id, IOAPICState),
         VMSTATE_UINT8(ioregsel, IOAPICState),
+        VMSTATE_UINT32(irr, IOAPICState),
         VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
         VMSTATE_END_OF_LIST()
     }

Re: [Qemu-devel] [PATCH] Fix ioapic vmstate

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 999 bytes --]

On 2011-06-17 09:30, Pavel Dovgaluk wrote:
>   This patch fixes save/restore vmstate of IOAPIC.
>   When irr member of IOAPICState is not saved and loaded,
> restoring becomes non-deterministic, because irr is kept from
> state of VM that was before loading.
> 
> Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>
> ---
>  hw/ioapic.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/ioapic.c b/hw/ioapic.c
> index 2109568..e583284 100644
> --- a/hw/ioapic.c
> +++ b/hw/ioapic.c
> @@ -207,6 +207,7 @@ static const VMStateDescription vmstate_ioapic = {
>      .fields      = (VMStateField []) {
>          VMSTATE_UINT8(id, IOAPICState),
>          VMSTATE_UINT8(ioregsel, IOAPICState),
> +        VMSTATE_UINT32(irr, IOAPICState),
>          VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
>          VMSTATE_END_OF_LIST()
>      }
> 

You are using an old qemu version. This was fixed via commit 35a74c5c59.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [Qemu-devel] [PATCH] Fix ioapic vmstate

[Andreas Färber]

Am 17.06.2011 um 09:30 schrieb Pavel Dovgaluk:

>  This patch fixes save/restore vmstate of IOAPIC.
>  When irr member of IOAPICState is not saved and loaded,
> restoring becomes non-deterministic, because irr is kept from
> state of VM that was before loading.
>
> Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>
> ---
> hw/ioapic.c |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/hw/ioapic.c b/hw/ioapic.c
> index 2109568..e583284 100644
> --- a/hw/ioapic.c
> +++ b/hw/ioapic.c
> @@ -207,6 +207,7 @@ static const VMStateDescription vmstate_ioapic = {
>     .fields      = (VMStateField []) {
>         VMSTATE_UINT8(id, IOAPICState),
>         VMSTATE_UINT8(ioregsel, IOAPICState),
> +        VMSTATE_UINT32(irr, IOAPICState),
>         VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
>         VMSTATE_END_OF_LIST()
>     }

You can't just add a field to VMState. Either the version_id must be  
incremented, or a subsection must be used.

Andreas