All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH for-6.2] hw/intc/arm_gicv3_its: Revert version increments in vmstate_its
@ 2021-11-22 17:10 Eric Auger
  2021-11-22 18:04 ` Peter Maydell
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Auger @ 2021-11-22 17:10 UTC (permalink / raw)
  To: eric.auger.pro, eric.auger, qemu-arm, peter.maydell,
	shashi.mallela, qemu-devel, drjones, richard.henderson

Commit 18f6290a6a ("hw/intc: GICv3 ITS initial framework")
incremented version_id and minimum_version_id fields of
VMStateDescription vmstate_its. This breaks the migration between
6.2 and 6.1 with the following message:

qemu-system-aarch64: savevm: unsupported version 1 for 'arm_gicv3_its' v0
qemu-system-aarch64: load of migration failed: Invalid argument

Revert that change.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 hw/intc/arm_gicv3_its_common.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c
index 7d7f3882e76..90b85f1e25c 100644
--- a/hw/intc/arm_gicv3_its_common.c
+++ b/hw/intc/arm_gicv3_its_common.c
@@ -50,8 +50,6 @@ static int gicv3_its_post_load(void *opaque, int version_id)
 
 static const VMStateDescription vmstate_its = {
     .name = "arm_gicv3_its",
-    .version_id = 1,
-    .minimum_version_id = 1,
     .pre_save = gicv3_its_pre_save,
     .post_load = gicv3_its_post_load,
     .priority = MIG_PRI_GICV3_ITS,
-- 
2.26.3



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH for-6.2] hw/intc/arm_gicv3_its: Revert version increments in vmstate_its
  2021-11-22 17:10 [PATCH for-6.2] hw/intc/arm_gicv3_its: Revert version increments in vmstate_its Eric Auger
@ 2021-11-22 18:04 ` Peter Maydell
  2021-11-22 20:46   ` Eric Auger
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2021-11-22 18:04 UTC (permalink / raw)
  To: Eric Auger
  Cc: drjones, shashi.mallela, richard.henderson, qemu-devel, qemu-arm,
	eric.auger.pro

On Mon, 22 Nov 2021 at 17:10, Eric Auger <eric.auger@redhat.com> wrote:
>
> Commit 18f6290a6a ("hw/intc: GICv3 ITS initial framework")
> incremented version_id and minimum_version_id fields of
> VMStateDescription vmstate_its. This breaks the migration between
> 6.2 and 6.1 with the following message:
>
> qemu-system-aarch64: savevm: unsupported version 1 for 'arm_gicv3_its' v0
> qemu-system-aarch64: load of migration failed: Invalid argument
>
> Revert that change.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> ---
>  hw/intc/arm_gicv3_its_common.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c
> index 7d7f3882e76..90b85f1e25c 100644
> --- a/hw/intc/arm_gicv3_its_common.c
> +++ b/hw/intc/arm_gicv3_its_common.c
> @@ -50,8 +50,6 @@ static int gicv3_its_post_load(void *opaque, int version_id)
>
>  static const VMStateDescription vmstate_its = {
>      .name = "arm_gicv3_its",
> -    .version_id = 1,
> -    .minimum_version_id = 1,
>      .pre_save = gicv3_its_pre_save,
>      .post_load = gicv3_its_post_load,
>      .priority = MIG_PRI_GICV3_ITS,

Oops, I didn't notice that the version bump lines were still
in the patchset I applied :-(

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH for-6.2] hw/intc/arm_gicv3_its: Revert version increments in vmstate_its
  2021-11-22 18:04 ` Peter Maydell
@ 2021-11-22 20:46   ` Eric Auger
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Auger @ 2021-11-22 20:46 UTC (permalink / raw)
  To: Peter Maydell
  Cc: drjones, shashi.mallela, richard.henderson, qemu-devel, qemu-arm,
	eric.auger.pro

Hi Peter,

On 11/22/21 7:04 PM, Peter Maydell wrote:
> On Mon, 22 Nov 2021 at 17:10, Eric Auger <eric.auger@redhat.com> wrote:
>> Commit 18f6290a6a ("hw/intc: GICv3 ITS initial framework")
>> incremented version_id and minimum_version_id fields of
>> VMStateDescription vmstate_its. This breaks the migration between
>> 6.2 and 6.1 with the following message:
>>
>> qemu-system-aarch64: savevm: unsupported version 1 for 'arm_gicv3_its' v0
>> qemu-system-aarch64: load of migration failed: Invalid argument
>>
>> Revert that change.
>>
>> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>> ---
>>  hw/intc/arm_gicv3_its_common.c | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c
>> index 7d7f3882e76..90b85f1e25c 100644
>> --- a/hw/intc/arm_gicv3_its_common.c
>> +++ b/hw/intc/arm_gicv3_its_common.c
>> @@ -50,8 +50,6 @@ static int gicv3_its_post_load(void *opaque, int version_id)
>>
>>  static const VMStateDescription vmstate_its = {
>>      .name = "arm_gicv3_its",
>> -    .version_id = 1,
>> -    .minimum_version_id = 1,
>>      .pre_save = gicv3_its_pre_save,
>>      .post_load = gicv3_its_post_load,
>>      .priority = MIG_PRI_GICV3_ITS,
> Oops, I didn't notice that the version bump lines were still
> in the patchset I applied :-(

No problem. I did not notice either ;-)

Thanks!

Eric
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> -- PMM
>



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-11-22 20:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 17:10 [PATCH for-6.2] hw/intc/arm_gicv3_its: Revert version increments in vmstate_its Eric Auger
2021-11-22 18:04 ` Peter Maydell
2021-11-22 20:46   ` Eric Auger

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.