diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2019-02-11 12:32:55 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-02-18 11:25:43 +0100 |
| commit | 09ced81aac76e1adfa0d4b9868f7dc4b38e66f19 (patch) | |
| tree | 948702f3c175e5e0f9a5e89eedd68042a1e31657 /hw/s390x/Makefile.objs | |
| parent | 44699e1c94bad41bbeb0c96f9ed344eb8e325413 (diff) | |
s390x: always provide pci support
We tried to make pci support optional on s390x in the past;
unfortunately, we still require the s390 phb to be created
unconditionally due to backwards compatibility issues.
Instead of sinking more effort into this (including compat
handling for older machines etc.) for non-obvious gains, let's
just make CONFIG_PCI something that is always set on s390x.
Note that you can still fence off pci for the _guest_ if you
provide a cpu model without the zpci feature.
Message-Id: <20190211113255.3837-1-cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x/Makefile.objs')
| -rw-r--r-- | hw/s390x/Makefile.objs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index a18c471913..bfd5326d7c 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -21,8 +21,7 @@ obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o obj-y += css-bridge.o obj-y += ccw-device.o -obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o -obj-$(call lnot,$(CONFIG_PCI)) += s390-pci-stub.o +obj-y += s390-pci-bus.o s390-pci-inst.o obj-y += s390-skeys.o obj-y += s390-stattrib.o obj-y += tod.o |