[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/44] s390x/pci: do not advertise pci on non-pci bui
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 17/44] s390x/pci: do not advertise pci on non-pci builds |
Date: |
Wed, 30 Aug 2017 18:52:25 +0200 |
Only set the zpci feature bit on builds that actually support pci.
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/kvm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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)) {
--
2.13.5
- [Qemu-devel] [PULL 07/44] tests: Run filter-redirector and -mirror test only on POSIX systems, (continued)
- [Qemu-devel] [PULL 07/44] tests: Run filter-redirector and -mirror test only on POSIX systems, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 08/44] tests: Add network filter tests to the check-qtest-s390x list, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 10/44] watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 09/44] s390x/tcg: specification exception for unknown diag, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 11/44] s390x: wire up diag288 in tcg, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 12/44] configure: enable --s390-pgste linker option, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 13/44] 9pfs: fix dependencies, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 14/44] kvm: remove hard dependency on pci, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 15/44] s390x/pci: add stubs, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 16/44] s390x: chsc nt2 events are pci-only, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 17/44] s390x/pci: do not advertise pci on non-pci builds,
Cornelia Huck <=
- [Qemu-devel] [PULL 18/44] s390x/ccw: create s390 phb conditionally, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 19/44] s390x/sclp: properly guard pci-specific functions, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 20/44] s390x/pci: fence off instructions for non-pci, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 21/44] s390x: refine pci dependencies, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 22/44] s390x/s390-skeys: Mark the storage key devices with user_creatable = false, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 24/44] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 25/44] target/s390x: simplify ri_allowed(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 26/44] target/s390x: simplify gs_allowed(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers, Cornelia Huck, 2017/08/30