From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da1qT-0000CL-3g for qemu-devel@nongnu.org; Tue, 25 Jul 2017 11:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1da1qP-00082b-52 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 11:34:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37192) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1da1qO-00082O-VJ for qemu-devel@nongnu.org; Tue, 25 Jul 2017 11:33:57 -0400 From: Cornelia Huck Date: Tue, 25 Jul 2017 17:33:25 +0200 Message-Id: <20170725153330.14966-5-cohuck@redhat.com> In-Reply-To: <20170725153330.14966-1-cohuck@redhat.com> References: <20170725153330.14966-1-cohuck@redhat.com> Subject: [Qemu-devel] [PATCH v3 4/9] s390x/pci: do not advertise pci on non-pci builds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, agraf@suse.de, thuth@redhat.com, david@redhat.com, pmorel@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com, Cornelia Huck Only set the zpci feature bit on builds that actually support pci. Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-bus.c | 5 +++++ hw/s390x/s390-pci-bus.h | 1 + hw/s390x/s390-pci-stub.c | 4 ++++ target/s390x/kvm.c | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index c57f6ebae0..7b30d4c7bd 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -34,6 +34,11 @@ } \ } while (0) +void pci_enable_zpci_feature(S390CPUModel *model) +{ + set_bit(S390_FEAT_ZPCI, model->features); +} + S390pciState *s390_get_phb(void) { static S390pciState *phb; diff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h index 5df6292509..d8796536b0 100644 --- a/hw/s390x/s390-pci-bus.h +++ b/hw/s390x/s390-pci-bus.h @@ -333,4 +333,5 @@ S390PCIBusDevice *s390_pci_find_dev_by_fid(S390pciState *s, uint32_t fid); S390PCIBusDevice *s390_pci_find_next_avail_dev(S390pciState *s, S390PCIBusDevice *pbdev); +void pci_enable_zpci_feature(S390CPUModel *model); #endif diff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c index cc7278a865..8ceaf482e7 100644 --- a/hw/s390x/s390-pci-stub.c +++ b/hw/s390x/s390-pci-stub.c @@ -72,3 +72,7 @@ S390PCIBusDevice *s390_pci_find_dev_by_idx(S390pciState *s, uint32_t idx) { return NULL; } + +void pci_enable_zpci_feature(S390CPUModel *model) +{ +} diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index c4c5791d27..866ac3d414 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2662,7 +2662,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 */ - set_bit(S390_FEAT_ZPCI, model->features); + pci_enable_zpci_feature(model); set_bit(S390_FEAT_ADAPTER_EVENT_NOTIFICATION, model->features); if (s390_known_cpu_type(cpu_type)) { -- 2.13.3