[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/38] s390x/pci: assert zpci always existing
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 03/38] s390x/pci: assert zpci always existing |
Date: |
Tue, 6 Sep 2016 09:46:35 +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] [PULL 05/38] s390x: wrap flic savevm calls into vmstate, (continued)
- [Qemu-devel] [PULL 05/38] s390x: wrap flic savevm calls into vmstate, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 11/38] s390x/cpumodel: "host" and "qemu" as CPU subclasses, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 09/38] s390x/kvm: 2 byte software breakpoint support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 06/38] s390x/ioinst: advertise fcs facility, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 14/38] s390x/cpumodel: generate CPU feature lists for CPU models, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 07/38] s390x/css: handle cssid 255 correctly, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 13/38] s390x/cpumodel: introduce CPU features, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 04/38] s390/sclp: cache the sclp device, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 15/38] s390x/cpumodel: generate CPU feature group lists, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 10/38] qmp: details about CPU definitions in query-cpu-definitions, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 03/38] s390x/pci: assert zpci always existing,
Cornelia Huck <=
- [Qemu-devel] [PULL 17/38] s390x/cpumodel: register defined CPU models as subclasses, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 27/38] s390x/sclp: propagate hmfai, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 21/38] s390x/cpumodel: check and apply the CPU model, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 29/38] s390x/kvm: implement CPU model support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 28/38] s390x/kvm: allow runtime-instrumentation for "none" machine, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 32/38] s390x/kvm: don't enable key wrapping if msa3 is disabled, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 23/38] s390x/sclp: introduce sclp feature blocks, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 36/38] s390x/cpumodel: implement QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 37/38] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 30/38] s390x/kvm: disable host model for problematic compat machines, Cornelia Huck, 2016/09/06