Pablo Greco e6a3ae
From c66f28ded3ebb8926eeed2ce6abea53053359c99 Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Date: Wed, 17 Apr 2019 13:57:24 +0100
Pablo Greco e6a3ae
Subject: [PATCH 07/24] s390x/pci: properly fail if the zPCI device cannot be
Pablo Greco e6a3ae
 created
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Message-id: <20190417135741.25297-8-cohuck@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 85792
Pablo Greco e6a3ae
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 07/24] s390x/pci: properly fail if the zPCI device cannot be created
Pablo Greco e6a3ae
Bugzilla: 1699070
Pablo Greco e6a3ae
RH-Acked-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
From: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Right now, errors during realize()/pre_plug/plug of the zPCI device
Pablo Greco e6a3ae
would result in QEMU crashing instead of failing nicely when creating
Pablo Greco e6a3ae
a zPCI device for a PCI device.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Reviewed-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Pablo Greco e6a3ae
Signed-off-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Message-Id: <20181113121710.18490-1-david@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
(cherry picked from commit b6e67ecc7b6e8938982ab94820c079f24845f623)
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Changes:
Pablo Greco e6a3ae
  We don't have 4b5766488f ("error: Fix use of error_prepend() with
Pablo Greco e6a3ae
  &error_fatal, &error_abort") downstream.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 hw/s390x/s390-pci-bus.c | 25 +++++++++++++++++++------
Pablo Greco e6a3ae
 1 file changed, 19 insertions(+), 6 deletions(-)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
index f253774..e6f5d91 100644
Pablo Greco e6a3ae
--- a/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
+++ b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
@@ -780,17 +780,31 @@ static void s390_pci_msix_free(S390PCIBusDevice *pbdev)
Pablo Greco e6a3ae
 }
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
 static S390PCIBusDevice *s390_pci_device_new(S390pciState *s,
Pablo Greco e6a3ae
-                                             const char *target)
Pablo Greco e6a3ae
+                                             const char *target, Error **errp)
Pablo Greco e6a3ae
 {
Pablo Greco e6a3ae
-    DeviceState *dev = NULL;
Pablo Greco e6a3ae
+    Error *local_err = NULL;
Pablo Greco e6a3ae
+    DeviceState *dev;
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
     dev = qdev_try_create(BUS(s->bus), TYPE_S390_PCI_DEVICE);
Pablo Greco e6a3ae
     if (!dev) {
Pablo Greco e6a3ae
+        error_setg(errp, "zPCI device could not be created");
Pablo Greco e6a3ae
         return NULL;
Pablo Greco e6a3ae
     }
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
-    qdev_prop_set_string(dev, "target", target);
Pablo Greco e6a3ae
-    qdev_init_nofail(dev);
Pablo Greco e6a3ae
+    object_property_set_str(OBJECT(dev), target, "target", &local_err);
Pablo Greco e6a3ae
+    if (local_err) {
Pablo Greco e6a3ae
+        object_unparent(OBJECT(dev));
Pablo Greco e6a3ae
+        error_prepend(&local_err, "zPCI device could not be created: ");
Pablo Greco e6a3ae
+        error_propagate(errp, local_err);
Pablo Greco e6a3ae
+        return NULL;
Pablo Greco e6a3ae
+    }
Pablo Greco e6a3ae
+    object_property_set_bool(OBJECT(dev), true, "realized", &local_err);
Pablo Greco e6a3ae
+    if (local_err) {
Pablo Greco e6a3ae
+        object_unparent(OBJECT(dev));
Pablo Greco e6a3ae
+        error_prepend(&local_err, "zPCI device could not be created: ");
Pablo Greco e6a3ae
+        error_propagate(errp, local_err);
Pablo Greco e6a3ae
+        return NULL;
Pablo Greco e6a3ae
+    }
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
     return S390_PCI_DEVICE(dev);
Pablo Greco e6a3ae
 }
Pablo Greco e6a3ae
@@ -865,9 +879,8 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
         pbdev = s390_pci_find_dev_by_target(s, dev->id);
Pablo Greco e6a3ae
         if (!pbdev) {
Pablo Greco e6a3ae
-            pbdev = s390_pci_device_new(s, dev->id);
Pablo Greco e6a3ae
+            pbdev = s390_pci_device_new(s, dev->id, errp);
Pablo Greco e6a3ae
             if (!pbdev) {
Pablo Greco e6a3ae
-                error_setg(errp, "create zpci device failed");
Pablo Greco e6a3ae
                 return;
Pablo Greco e6a3ae
             }
Pablo Greco e6a3ae
         }
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae