]> git.proxmox.com Git - mirror_qemu.git/commitdiff
s390x/pci: do not advertise pci on non-pci builds
authorCornelia Huck <cohuck@redhat.com>
Mon, 17 Jul 2017 09:07:57 +0000 (11:07 +0200)
committerCornelia Huck <cohuck@redhat.com>
Wed, 30 Aug 2017 16:23:25 +0000 (18:23 +0200)
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>
target/s390x/kvm.c

index c4c5791d27f9b0f1ec8922c9d7fddea42c599a4a..bc62bba5b7675a1d9ed61f9ed0a1c7118bfc49fa 100644 (file)
@@ -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)) {