diff options
| author | Cornelia Huck | 2019-02-11 12:32:55 +0100 |
|---|---|---|
| committer | Cornelia Huck | 2019-02-18 11:25:43 +0100 |
| commit | 09ced81aac76e1adfa0d4b9868f7dc4b38e66f19 (patch) | |
| tree | 948702f3c175e5e0f9a5e89eedd68042a1e31657 /target/s390x/kvm.c | |
| parent | s390x: Fix the confusing contributions-after-2012 license statements (diff) | |
| download | qemu-09ced81aac76e1adfa0d4b9868f7dc4b38e66f19.tar.gz qemu-09ced81aac76e1adfa0d4b9868f7dc4b38e66f19.tar.xz qemu-09ced81aac76e1adfa0d4b9868f7dc4b38e66f19.zip | |
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 'target/s390x/kvm.c')
| -rw-r--r-- | target/s390x/kvm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 9ff80c8461..15fdc168e1 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2278,9 +2278,7 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) } /* We emulate a zPCI bus and AEN, therefore we don't need HW support */ - if (pci_available) { - set_bit(S390_FEAT_ZPCI, model->features); - } + set_bit(S390_FEAT_ZPCI, model->features); set_bit(S390_FEAT_ADAPTER_EVENT_NOTIFICATION, model->features); if (s390_known_cpu_type(cpu_type)) { |