aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorCornelia Huck <cohuck@redhat.com>2017-07-17 11:07:57 +0200
committerCornelia Huck <cohuck@redhat.com>2017-08-30 18:23:25 +0200
commit21eb052cf2934fcf94e671f0a84d596874538459 (patch)
tree8e1750be3e6fffcd6d3a362aa9a0bc6d5727ac07 /target
parent1c5deaec77870961f6575e946d5af7a7d0831e57 (diff)
s390x/pci: do not advertise pci on non-pci builds
Only set the zpci feature bit on builds that actually support pci. Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
-rw-r--r--target/s390x/kvm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index c4c5791d27..bc62bba5b7 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2662,7 +2662,9 @@ 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 */
- set_bit(S390_FEAT_ZPCI, model->features);
+ if (pci_available) {
+ set_bit(S390_FEAT_ZPCI, model->features);
+ }
set_bit(S390_FEAT_ADAPTER_EVENT_NOTIFICATION, model->features);
if (s390_known_cpu_type(cpu_type)) {