From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKKu-00039g-Oa for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKKs-0006IP-3f for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:18:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51950) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKKr-0006GE-RQ for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:18:38 -0400 References: <20170725153330.14966-1-cohuck@redhat.com> <20170725153330.14966-5-cohuck@redhat.com> <94e8efb0-0cde-0a3f-339f-28647eec5f82@redhat.com> From: Thomas Huth Message-ID: <14e8f1ea-ddd6-ad66-94c0-7396098d8688@redhat.com> Date: Wed, 26 Jul 2017 13:18:29 +0200 MIME-Version: 1.0 In-Reply-To: <94e8efb0-0cde-0a3f-339f-28647eec5f82@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [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: David Hildenbrand , Cornelia Huck , qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, zyimin@linux.vnet.ibm.com, pmorel@linux.vnet.ibm.com, agraf@suse.de On 26.07.2017 11:28, David Hildenbrand wrote: > On 25.07.2017 17:33, Cornelia Huck wrote: >> 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); > > While I see how this solves the problem, I don't really like it. If > there is a function "save_the_world()" I expect it to save the world in > all scenarios ;) > > What about the same approach but rather > > if(pci_configured()) > set_bit(S390_FEAT_ZPCI, model->features); Or maybe something like this (without introducing new functions): if (object_class_by_name(TYPE_S390_PCI_HOST_BRIDGE)) { set_bit(S390_FEAT_ZPCI, model->features); } ? I haven't tested this, though, but I think it should work since the S390_PCI classes are only compiled in if CONFIG_PCI=y. Thomas