From 1b270931bb1743918638b9e6f003b2f2a95f0685 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:35 +0100

Subject: [PATCH 18/24] s390x/pci: mark zpci devices as unmigratable

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-19-cohuck@redhat.com>

Patchwork-id: 85796

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 18/24] s390x/pci: mark zpci devices as unmigratable

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

We currently don't migrate any state for zpci devices, which are

coupled with standard pci devices. This means funny things happen

when we e.g. try to migrate with a virtio-pci device but the s390x-

specific zpci state is not migrated (vfio-pci is not affected, as

it is not migratable anyway.)

Until this is fixed, mark zpci devices as unmigratable.

Reported-by: David Hildenbrand <david@redhat.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit aede5d5dfc5f3e4ea7467b28c51fda2f8945d117)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/s390-pci-bus.c | 10 ++++++++++

 1 file changed, 10 insertions(+)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c

index 97d3eb8..07a286a 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -1256,6 +1256,15 @@ static Property s390_pci_device_properties[] = {

     DEFINE_PROP_END_OF_LIST(),

 };

+static const VMStateDescription s390_pci_device_vmstate = {

+    .name = TYPE_S390_PCI_DEVICE,

+    /*

+     * TODO: add state handling here, so migration works at least with

+     * emulated pci devices on s390x

+     */

+    .unmigratable = 1,

+};

+

 static void s390_pci_device_class_init(ObjectClass *klass, void *data)

 {

     DeviceClass *dc = DEVICE_CLASS(klass);

@@ -1266,6 +1275,7 @@ static void s390_pci_device_class_init(ObjectClass *klass, void *data)

     dc->bus_type = TYPE_S390_PCI_BUS;

     dc->realize = s390_pci_device_realize;

     dc->props = s390_pci_device_properties;

+    dc->vmsd = &s390_pci_device_vmstate;

 }

 static const TypeInfo s390_pci_device_info = {

-- 

1.8.3.1