| Message ID | 20180727123112.13707-1-dgilbert@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | macio/pmu: Fix missing vmsd terminator | expand |
On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Fix missing terminator in VMStateDescription > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hw/misc/macio/pmu.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > index e246b0fd41..27dfaf8a74 100644 > --- a/hw/misc/macio/pmu.c > +++ b/hw/misc/macio/pmu.c > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > VMSTATE_UINT8(adb_reply_size, PMUState), > VMSTATE_BUFFER(adb_reply, PMUState), > + VMSTATE_END_OF_LIST() > } > }; Gah, yes indeed it certainly looks like I missed this whilst working on the PMU code :( Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Just out of interest does a savevm/loadvm migration still succeed once this has been added? ATB, Mark.
On 27/07/2018 14:31, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Fix missing terminator in VMStateDescription > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hw/misc/macio/pmu.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > index e246b0fd41..27dfaf8a74 100644 > --- a/hw/misc/macio/pmu.c > +++ b/hw/misc/macio/pmu.c > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > VMSTATE_UINT8(adb_reply_size, PMUState), > VMSTATE_BUFFER(adb_reply, PMUState), > + VMSTATE_END_OF_LIST() > } > }; > > Reviewed-by: Laurent Vivier <lvivier@redhat.com>
* Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > Fix missing terminator in VMStateDescription > > > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > --- > > hw/misc/macio/pmu.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > > index e246b0fd41..27dfaf8a74 100644 > > --- a/hw/misc/macio/pmu.c > > +++ b/hw/misc/macio/pmu.c > > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > > VMSTATE_UINT8(adb_reply_size, PMUState), > > VMSTATE_BUFFER(adb_reply, PMUState), > > + VMSTATE_END_OF_LIST() > > } > > }; > > Gah, yes indeed it certainly looks like I missed this whilst working on the > PMU code :( > > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > Just out of interest does a savevm/loadvm migration still succeed once this > has been added? Have you got a suggested command line to test it with? Dave > > ATB, > > Mark. -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 27/07/18 14:44, Dr. David Alan Gilbert wrote: > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: >> On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: >> >>> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >>> >>> Fix missing terminator in VMStateDescription >>> >>> Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce >>> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> >>> --- >>> hw/misc/macio/pmu.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c >>> index e246b0fd41..27dfaf8a74 100644 >>> --- a/hw/misc/macio/pmu.c >>> +++ b/hw/misc/macio/pmu.c >>> @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { >>> VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), >>> VMSTATE_UINT8(adb_reply_size, PMUState), >>> VMSTATE_BUFFER(adb_reply, PMUState), >>> + VMSTATE_END_OF_LIST() >>> } >>> }; >> >> Gah, yes indeed it certainly looks like I missed this whilst working on the >> PMU code :( >> >> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> >> Just out of interest does a savevm/loadvm migration still succeed once this >> has been added? > > Have you got a suggested command line to test it with? I'm effectively AFK until tomorrow now, but just quickly: $ ./qemu-system-ppc -M mac99,via=pmu Note that PMU support is new for 3.0 so there shouldn't be any backward compatibility issue here. ATB, Mark.
* Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > On 27/07/18 14:44, Dr. David Alan Gilbert wrote: > > > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > > > On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: > > > > > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > > > > > Fix missing terminator in VMStateDescription > > > > > > > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > > > --- > > > > hw/misc/macio/pmu.c | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > > > > index e246b0fd41..27dfaf8a74 100644 > > > > --- a/hw/misc/macio/pmu.c > > > > +++ b/hw/misc/macio/pmu.c > > > > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > > > > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > > > > VMSTATE_UINT8(adb_reply_size, PMUState), > > > > VMSTATE_BUFFER(adb_reply, PMUState), > > > > + VMSTATE_END_OF_LIST() > > > > } > > > > }; > > > > > > Gah, yes indeed it certainly looks like I missed this whilst working on the > > > PMU code :( > > > > > > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > > > > > Just out of interest does a savevm/loadvm migration still succeed once this > > > has been added? > > > > Have you got a suggested command line to test it with? > > I'm effectively AFK until tomorrow now, but just quickly: > > $ ./qemu-system-ppc -M mac99,via=pmu > > Note that PMU support is new for 3.0 so there shouldn't be any backward > compatibility issue here. [root@virtlab414 try-64]# ./ppc-softmmu/qemu-system-ppc -M mac99,via=pmu -nographic /home/vms/dummy1.qcow2 QEMU 2.12.50 monitor - type 'help' for more information (qemu) ss>> et_property: NULL phandle >> ============================================================= >> OpenBIOS 1.1 [Jun 18 2018 18:20] >> Configuration device id QEMU version 1 machine id 1 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,G4 milliseconds isn't unique. saWelcome to OpenBIOS v1.1 built on Jun 18 2018 18:20 Trying hd:,\\:tbxi... savTrying hd:,\ppc\bootinfo.txt... Trying hd:,%BOOT... saveNo valid state has been set by load or init-program (qemu) ok 0 > ok 0 > (qemu) (qemu) savevm "frob" (qemu) loadvm "frob" (qemu) ok 0 > 2 2 + . 4 ok Looks OK to me. Dave > > ATB, > > Mark. -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
I noticed this hadn't got merged - who wants it? Dave * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > > On 27/07/18 14:44, Dr. David Alan Gilbert wrote: > > > > > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > > > > On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: > > > > > > > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > > > > > > > Fix missing terminator in VMStateDescription > > > > > > > > > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > > > > --- > > > > > hw/misc/macio/pmu.c | 1 + > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > > > > > index e246b0fd41..27dfaf8a74 100644 > > > > > --- a/hw/misc/macio/pmu.c > > > > > +++ b/hw/misc/macio/pmu.c > > > > > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > > > > > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > > > > > VMSTATE_UINT8(adb_reply_size, PMUState), > > > > > VMSTATE_BUFFER(adb_reply, PMUState), > > > > > + VMSTATE_END_OF_LIST() > > > > > } > > > > > }; > > > > > > > > Gah, yes indeed it certainly looks like I missed this whilst working on the > > > > PMU code :( > > > > > > > > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > > > > > > > Just out of interest does a savevm/loadvm migration still succeed once this > > > > has been added? > > > > > > Have you got a suggested command line to test it with? > > > > I'm effectively AFK until tomorrow now, but just quickly: > > > > $ ./qemu-system-ppc -M mac99,via=pmu > > > > Note that PMU support is new for 3.0 so there shouldn't be any backward > > compatibility issue here. > > [root@virtlab414 try-64]# ./ppc-softmmu/qemu-system-ppc -M mac99,via=pmu -nographic /home/vms/dummy1.qcow2 > QEMU 2.12.50 monitor - type 'help' for more information > (qemu) ss>> et_property: NULL phandle > > >> ============================================================= > >> OpenBIOS 1.1 [Jun 18 2018 18:20] > >> Configuration device id QEMU version 1 machine id 1 > >> CPUs: 1 > >> Memory: 128M > >> UUID: 00000000-0000-0000-0000-000000000000 > >> CPU type PowerPC,G4 > milliseconds isn't unique. > saWelcome to OpenBIOS v1.1 built on Jun 18 2018 18:20 > Trying hd:,\\:tbxi... > savTrying hd:,\ppc\bootinfo.txt... > Trying hd:,%BOOT... > saveNo valid state has been set by load or init-program > > > (qemu) > ok > 0 > ok > 0 > (qemu) > (qemu) savevm "frob" > (qemu) loadvm "frob" > (qemu) > ok > 0 > 2 2 + . 4 ok > > Looks OK to me. > > Dave > > > > > ATB, > > > > Mark. > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On Tue, Oct 16, 2018 at 12:30:45PM +0100, Dr. David Alan Gilbert wrote: > > I noticed this hadn't got merged - who wants it? I think that's one for my tree, but I'm afraid I completely missed it before. It's generally best to CC me on ppc related patches, otherwise I'm likely to lose them in the flood of qemu-devel. Anyway, I dug it out of my archives and applied. > > Dave > > * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > > > On 27/07/18 14:44, Dr. David Alan Gilbert wrote: > > > > > > > * Mark Cave-Ayland (mark.cave-ayland@ilande.co.uk) wrote: > > > > > On 27/07/18 13:31, Dr. David Alan Gilbert (git) wrote: > > > > > > > > > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > > > > > > > > > Fix missing terminator in VMStateDescription > > > > > > > > > > > > Fixes: d811d61fbc6ca5f2be2185fd7cfa916e7ba613ce > > > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > > > > > --- > > > > > > hw/misc/macio/pmu.c | 1 + > > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > > > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > > > > > > index e246b0fd41..27dfaf8a74 100644 > > > > > > --- a/hw/misc/macio/pmu.c > > > > > > +++ b/hw/misc/macio/pmu.c > > > > > > @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { > > > > > > VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), > > > > > > VMSTATE_UINT8(adb_reply_size, PMUState), > > > > > > VMSTATE_BUFFER(adb_reply, PMUState), > > > > > > + VMSTATE_END_OF_LIST() > > > > > > } > > > > > > }; > > > > > > > > > > Gah, yes indeed it certainly looks like I missed this whilst working on the > > > > > PMU code :( > > > > > > > > > > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > > > > > > > > > Just out of interest does a savevm/loadvm migration still succeed once this > > > > > has been added? > > > > > > > > Have you got a suggested command line to test it with? > > > > > > I'm effectively AFK until tomorrow now, but just quickly: > > > > > > $ ./qemu-system-ppc -M mac99,via=pmu > > > > > > Note that PMU support is new for 3.0 so there shouldn't be any backward > > > compatibility issue here. > > > > [root@virtlab414 try-64]# ./ppc-softmmu/qemu-system-ppc -M mac99,via=pmu -nographic /home/vms/dummy1.qcow2 > > QEMU 2.12.50 monitor - type 'help' for more information > > (qemu) ss>> et_property: NULL phandle > > > > >> ============================================================= > > >> OpenBIOS 1.1 [Jun 18 2018 18:20] > > >> Configuration device id QEMU version 1 machine id 1 > > >> CPUs: 1 > > >> Memory: 128M > > >> UUID: 00000000-0000-0000-0000-000000000000 > > >> CPU type PowerPC,G4 > > milliseconds isn't unique. > > saWelcome to OpenBIOS v1.1 built on Jun 18 2018 18:20 > > Trying hd:,\\:tbxi... > > savTrying hd:,\ppc\bootinfo.txt... > > Trying hd:,%BOOT... > > saveNo valid state has been set by load or init-program > > > > > > (qemu) > > ok > > 0 > ok > > 0 > (qemu) > > (qemu) savevm "frob" > > (qemu) loadvm "frob" > > (qemu) > > ok > > 0 > 2 2 + . 4 ok > > > > Looks OK to me. > > > > Dave > > > > > > > > ATB, > > > > > > Mark.
On 17/10/2018 01:34, David Gibson wrote: > On Tue, Oct 16, 2018 at 12:30:45PM +0100, Dr. David Alan Gilbert wrote: >> >> I noticed this hadn't got merged - who wants it? > > I think that's one for my tree, but I'm afraid I completely missed it > before. It's generally best to CC me on ppc related patches, > otherwise I'm likely to lose them in the flood of qemu-devel. > > Anyway, I dug it out of my archives and applied. Great - thanks David. Apologies for the delay in my response, I've been fairly flat out recently so not much time for QEMU hacking. ATB, Mark.
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index e246b0fd41..27dfaf8a74 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -686,6 +686,7 @@ static const VMStateDescription vmstate_pmu_adb = { VMSTATE_TIMER_PTR(adb_poll_timer, PMUState), VMSTATE_UINT8(adb_reply_size, PMUState), VMSTATE_BUFFER(adb_reply, PMUState), + VMSTATE_END_OF_LIST() } };