|
 |
4a2fec |
From c08eeabcb588c0cd8f9952e273fa6cdaea71d25c Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Date: Mon, 9 Oct 2017 15:50:33 +0200
|
|
|
4a2fec |
Subject: [PATCH 30/34] s390x/css: fix css migration compat handling
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Message-id: <1507564234-19627-2-git-send-email-thuth@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77038
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 1/2] s390x/css: fix css migration compat handling
|
|
|
4a2fec |
Bugzilla: 1473292
|
|
|
4a2fec |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Halil Pasic <pasic@linux.vnet.ibm.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Commit e996583eb3 ("s390x/css: activate ChannelSubSys migration",
|
|
|
4a2fec |
2017-07-11) was supposed to enable css migration for virtio-ccw
|
|
|
4a2fec |
machines starting 2.10, but it ended up effectively enabling it
|
|
|
4a2fec |
only for 2.10 as the registration of the appropriate VMStateDescription
|
|
|
4a2fec |
happens in ccw_machine_2_10_instance_options which does not get
|
|
|
4a2fec |
called for machines more recent than 2_10.
|
|
|
4a2fec |
|
|
|
4a2fec |
Let us move the corresponding chunk of code (which conditionally enables
|
|
|
4a2fec |
the migration based on the value of the corresponding class property) to
|
|
|
4a2fec |
ccw_init, which is called for each virtio-ccw machine instance.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
|
|
|
4a2fec |
Reported-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Message-Id: <20171004110109.16525-1-pasic@linux.vnet.ibm.com>
|
|
|
4a2fec |
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
4a2fec |
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
4a2fec |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 489c909f097a387eb6913c89cf1851750397110c)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Conflicts:
|
|
|
4a2fec |
hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
(contextual conflict since we do not have commit with id
|
|
|
4a2fec |
70d8d9a0c9bc599d8ae99dd65ff8535adb2acdfc in downstream yet)
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/s390x/s390-virtio-ccw.c | 6 +++---
|
|
|
4a2fec |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
index 1c7af39..1aec58c 100644
|
|
|
4a2fec |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
@@ -156,6 +156,9 @@ static void ccw_init(MachineState *machine)
|
|
|
4a2fec |
ret = css_create_css_image(VIRTUAL_CSSID, true);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
assert(ret == 0);
|
|
|
4a2fec |
+ if (css_migration_enabled()) {
|
|
|
4a2fec |
+ css_register_vmstate();
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Create VirtIO network adapters */
|
|
|
4a2fec |
s390_create_virtio_net(BUS(css_bus), "virtio-net-ccw");
|
|
|
4a2fec |
@@ -508,9 +511,6 @@ bool css_migration_enabled(void)
|
|
|
4a2fec |
|
|
|
4a2fec |
static void ccw_machine_2_10_instance_options(MachineState *machine)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
- if (css_migration_enabled()) {
|
|
|
4a2fec |
- css_register_vmstate();
|
|
|
4a2fec |
- }
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static void ccw_machine_2_10_class_options(MachineClass *mc)
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|