[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.8 03/38] s390x/pci: assert zpci always existin
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.8 03/38] s390x/pci: assert zpci always existing |
Date: |
Mon, 29 Aug 2016 13:44:55 +0200 |
From: Yi Min Zhao <address@hidden>
If one pci device is plugged successfully, there must be a zpci device
existing. This means that during hot-unplugging a pci device, its
corresponding zpci device must be found. Therefore we use an assert to
replace current code.
Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-bus.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 5750f22..ac8f06d 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -718,11 +718,7 @@ static void s390_pcihost_hot_unplug(HotplugHandler
*hotplug_dev,
break;
}
}
-
- if (!pbdev) {
- object_unparent(OBJECT(pci_dev));
- return;
- }
+ assert(pbdev != NULL);
} else if (object_dynamic_cast(OBJECT(dev), TYPE_S390_PCI_DEVICE)) {
pbdev = S390_PCI_DEVICE(dev);
pci_dev = pbdev->pdev;
--
2.9.3
- [Qemu-devel] [PATCH for-2.8 00/38] s390x patches for 2.8, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 03/38] s390x/pci: assert zpci always existing,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.8 10/38] qmp: details about CPU definitions in query-cpu-definitions, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 23/38] s390x/sclp: introduce sclp feature blocks, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 14/38] s390x/cpumodel: generate CPU feature lists for CPU models, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 04/38] s390/sclp: cache the sclp device, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 05/38] s390x: wrap flic savevm calls into vmstate, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 07/38] s390x/css: handle cssid 255 correctly, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 16/38] s390x/cpumodel: introduce CPU feature group definitions, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 01/38] s390x: add compat machine for 2.8, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 26/38] s390x/sclp: propagate the mha via sclp, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 17/38] s390x/cpumodel: register defined CPU models as subclasses, Cornelia Huck, 2016/08/29