| Message ID | 20240517061553.564529-1-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/intc/s390_flic: Fix crash that occurs when saving the machine state | expand |
On 5/17/24 08:15, Thomas Huth wrote: > adapter_info_so_needed() treats its "opaque" parameter as a S390FLICState, > but the function belongs to a VMStateDescription that is attached to a > TYPE_VIRTIO_CCW_BUS device. This is currently causing a crash when the > user tries to save or migrate the VM state. Fix it by using s390_get_flic() > to get the correct device here instead. > > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Fixes: 9d1b0f5bf5 ("s390_flic: add migration-enabled property") > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/intc/s390_flic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c > index 7f93080087..6771645699 100644 > --- a/hw/intc/s390_flic.c > +++ b/hw/intc/s390_flic.c > @@ -459,7 +459,7 @@ type_init(qemu_s390_flic_register_types) > > static bool adapter_info_so_needed(void *opaque) > { > - S390FLICState *fs = S390_FLIC_COMMON(opaque); > + S390FLICState *fs = s390_get_flic(); > > return fs->migration_enabled; > }
On Fri, May 17, 2024 at 08:15 AM +0200, Thomas Huth <thuth@redhat.com> wrote: > adapter_info_so_needed() treats its "opaque" parameter as a S390FLICState, > but the function belongs to a VMStateDescription that is attached to a > TYPE_VIRTIO_CCW_BUS device. This is currently causing a crash when the > user tries to save or migrate the VM state. Fix it by using s390_get_flic() > to get the correct device here instead. > > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Fixes: 9d1b0f5bf5 ("s390_flic: add migration-enabled property") > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/intc/s390_flic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c > index 7f93080087..6771645699 100644 > --- a/hw/intc/s390_flic.c > +++ b/hw/intc/s390_flic.c > @@ -459,7 +459,7 @@ type_init(qemu_s390_flic_register_types) > > static bool adapter_info_so_needed(void *opaque) > { > - S390FLICState *fs = S390_FLIC_COMMON(opaque); > + S390FLICState *fs = s390_get_flic(); > > return fs->migration_enabled; > } > -- > 2.45.0 > Tested-by: Marc Hartmayer <mhartmay@linux.ibm.com> Thanks.
On 17/5/24 08:15, Thomas Huth wrote: > adapter_info_so_needed() treats its "opaque" parameter as a S390FLICState, > but the function belongs to a VMStateDescription that is attached to a > TYPE_VIRTIO_CCW_BUS device. This is currently causing a crash when the > user tries to save or migrate the VM state. Fix it by using s390_get_flic() > to get the correct device here instead. > > Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Fixes: 9d1b0f5bf5 ("s390_flic: add migration-enabled property") > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/intc/s390_flic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 7f93080087..6771645699 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -459,7 +459,7 @@ type_init(qemu_s390_flic_register_types) static bool adapter_info_so_needed(void *opaque) { - S390FLICState *fs = S390_FLIC_COMMON(opaque); + S390FLICState *fs = s390_get_flic(); return fs->migration_enabled; }
adapter_info_so_needed() treats its "opaque" parameter as a S390FLICState, but the function belongs to a VMStateDescription that is attached to a TYPE_VIRTIO_CCW_BUS device. This is currently causing a crash when the user tries to save or migrate the VM state. Fix it by using s390_get_flic() to get the correct device here instead. Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com> Fixes: 9d1b0f5bf5 ("s390_flic: add migration-enabled property") Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/intc/s390_flic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)