[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/9] s390x/ccw: create s390 phb conditionally
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH v3 5/9] s390x/ccw: create s390 phb conditionally |
Date: |
Tue, 25 Jul 2017 17:33:26 +0200 |
Don't create the s390 pci host bridge if we do not provide the zpci
facility.
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1c7af39ce6..8be4a541c1 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -118,7 +118,6 @@ static void ccw_init(MachineState *machine)
{
int ret;
VirtualCssBus *css_bus;
- DeviceState *dev;
s390_sclp_init();
s390_memory_init(machine->ram_size);
@@ -134,10 +133,13 @@ static void ccw_init(MachineState *machine)
machine->initrd_filename, "s390-ccw.img",
"s390-netboot.img", true);
- dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
- object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,
- OBJECT(dev), NULL);
- qdev_init_nofail(dev);
+ if (s390_has_feat(S390_FEAT_ZPCI)) {
+ DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
+ object_property_add_child(qdev_get_machine(),
+ TYPE_S390_PCI_HOST_BRIDGE,
+ OBJECT(dev), NULL);
+ qdev_init_nofail(dev);
+ }
/* register hypercalls */
virtio_ccw_register_hcalls();
--
2.13.3
- [Qemu-devel] [PATCH v3 3/9] s390x: chsc nt2 events are pci-only, (continued)
- [Qemu-devel] [PATCH v3 3/9] s390x: chsc nt2 events are pci-only, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PATCH v3 4/9] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PATCH v3 5/9] s390x/ccw: create s390 phb conditionally,
Cornelia Huck <=
- [Qemu-devel] [PATCH v3 6/9] s390x/sclp: properly guard pci-specific functions, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PATCH v3 7/9] s390x/pci: fence off instructions for non-pci, Cornelia Huck, 2017/07/25
- [Qemu-devel] [PATCH v3 8/9] s390x/kvm: msi route fixup for non-pci, Cornelia Huck, 2017/07/25
[Qemu-devel] [PATCH v3 9/9] s390x: refine pci dependencies, Cornelia Huck, 2017/07/25