From c66f28ded3ebb8926eeed2ce6abea53053359c99 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

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

Subject: [PATCH 07/24] s390x/pci: properly fail if the zPCI device cannot be

 created

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

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

Patchwork-id: 85792

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 07/24] s390x/pci: properly fail if the zPCI device cannot be created

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>

From: David Hildenbrand <david@redhat.com>

Right now, errors during realize()/pre_plug/plug of the zPCI device

would result in QEMU crashing instead of failing nicely when creating

a zPCI device for a PCI device.

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

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

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

Message-Id: <20181113121710.18490-1-david@redhat.com>

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

(cherry picked from commit b6e67ecc7b6e8938982ab94820c079f24845f623)

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

Changes:

  We don't have 4b5766488f ("error: Fix use of error_prepend() with

  &error_fatal, &error_abort") downstream.

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

---

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

 1 file changed, 19 insertions(+), 6 deletions(-)

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

index f253774..e6f5d91 100644

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

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

@@ -780,17 +780,31 @@ static void s390_pci_msix_free(S390PCIBusDevice *pbdev)

 }

 static S390PCIBusDevice *s390_pci_device_new(S390pciState *s,

-                                             const char *target)

+                                             const char *target, Error **errp)

 {

-    DeviceState *dev = NULL;

+    Error *local_err = NULL;

+    DeviceState *dev;

     dev = qdev_try_create(BUS(s->bus), TYPE_S390_PCI_DEVICE);

     if (!dev) {

+        error_setg(errp, "zPCI device could not be created");

         return NULL;

     }

-    qdev_prop_set_string(dev, "target", target);

-    qdev_init_nofail(dev);

+    object_property_set_str(OBJECT(dev), target, "target", &local_err);

+    if (local_err) {

+        object_unparent(OBJECT(dev));

+        error_prepend(&local_err, "zPCI device could not be created: ");

+        error_propagate(errp, local_err);

+        return NULL;

+    }

+    object_property_set_bool(OBJECT(dev), true, "realized", &local_err);

+    if (local_err) {

+        object_unparent(OBJECT(dev));

+        error_prepend(&local_err, "zPCI device could not be created: ");

+        error_propagate(errp, local_err);

+        return NULL;

+    }

     return S390_PCI_DEVICE(dev);

 }

@@ -865,9 +879,8 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,

         pbdev = s390_pci_find_dev_by_target(s, dev->id);

         if (!pbdev) {

-            pbdev = s390_pci_device_new(s, dev->id);

+            pbdev = s390_pci_device_new(s, dev->id, errp);

             if (!pbdev) {

-                error_setg(errp, "create zpci device failed");

                 return;

             }

         }

-- 

1.8.3.1