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