| Message ID | 20200113174521.3336-1-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] hw/i386: disable smbus migration for xenpv | expand |
Am Mon, 13 Jan 2020 18:45:21 +0100
schrieb Olaf Hering <olaf@aepfle.de>:
> commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle xenpv
Actually it is xenFv, but you get the idea.
Olaf
On Mon, Jan 13, 2020 at 06:45:21PM +0100, Olaf Hering wrote: > With commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea a new member > smbus_no_migration_support was added, and enabled in two places. > With commit 4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi > got new elements, which are conditionally filled. As a result, an > incoming migration expected smbus related data unless smbus migration > was disabled for a given MachineClass. > > Since commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle > xenpv, live migration to receiving hosts using qemu-4.0 and later is broken. > Therefore this patch must be applied to stable-4.x as well. > > Signed-off-by: Olaf Hering <olaf@aepfle.de> Thanks! I think you need to copy Xen maintainers to ack this. Suggest reposting with a fixed commit message and cc appropriate maintainers. > --- > hw/i386/pc_piix.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index fa12203079..e19716d0d3 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -952,6 +952,7 @@ static void xenfv_machine_options(MachineClass *m) > m->desc = "Xen Fully-virtualized PC"; > m->max_cpus = HVM_MAX_VCPUS; > m->default_machine_opts = "accel=xen"; > + m->smbus_no_migration_support = true; > } > > DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fa12203079..e19716d0d3 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -952,6 +952,7 @@ static void xenfv_machine_options(MachineClass *m) m->desc = "Xen Fully-virtualized PC"; m->max_cpus = HVM_MAX_VCPUS; m->default_machine_opts = "accel=xen"; + m->smbus_no_migration_support = true; } DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
With commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea a new member smbus_no_migration_support was added, and enabled in two places. With commit 4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new elements, which are conditionally filled. As a result, an incoming migration expected smbus related data unless smbus migration was disabled for a given MachineClass. Since commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea forgot to handle xenpv, live migration to receiving hosts using qemu-4.0 and later is broken. Therefore this patch must be applied to stable-4.x as well. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- hw/i386/pc_piix.c | 1 + 1 file changed, 1 insertion(+)