From: Cornelia Huck <cohuck@redhat.com>
Date: Mon, 17 Jul 2017 09:07:57 +0000 (+0200)
Subject: s390x/pci: do not advertise pci on non-pci builds
X-Git-Tag: v2.11.0-rc0~144^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21eb052cf2934fcf94e671f0a84d596874538459;p=thirdparty%2Fqemu.git

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>
---

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index c4c5791d27f..bc62bba5b76 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)) {