[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/10] s390x/ccw: create s390 phb conditionally
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH v4 06/10] s390x/ccw: create s390 phb conditionally |
Date: |
Mon, 21 Aug 2017 11:16:10 +0200 |
Don't create the s390 pci host bridge if we do not provide the zpci
facility.
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index d3d67b8d77..8331c0a275 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -118,12 +118,11 @@ static void ccw_init(MachineState *machine)
{
int ret;
VirtualCssBus *css_bus;
- DeviceState *dev;
s390_sclp_init();
s390_memory_init(machine->ram_size);
- /* init CPUs */
+ /* init CPUs (incl. CPU model) early so s390_has_feature() works */
s390_init_cpus(machine);
s390_flic_init();
@@ -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.5
- [Qemu-devel] [PATCH v4 00/10] zpci detangling, Cornelia Huck, 2017/08/21
- [Qemu-devel] [PATCH v4 04/10] s390x: chsc nt2 events are pci-only, Cornelia Huck, 2017/08/21
- [Qemu-devel] [PATCH v4 03/10] s390x/pci: add stubs, Cornelia Huck, 2017/08/21
- [Qemu-devel] [PATCH v4 05/10] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/08/21
- [Qemu-devel] [PATCH v4 06/10] s390x/ccw: create s390 phb conditionally,
Cornelia Huck <=
- [Qemu-devel] [PATCH v4 08/10] s390x/pci: fence off instructions for non-pci, Cornelia Huck, 2017/08/21
- [Qemu-devel] [PATCH v4 07/10] s390x/sclp: properly guard pci-specific functions, Cornelia Huck, 2017/08/21
- Re: [Qemu-devel] [PATCH v4 07/10] s390x/sclp: properly guard pci-specific functions, Pierre Morel, 2017/08/21