From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTSGw-0008HL-56 for qemu-devel@nongnu.org; Fri, 07 Jul 2017 08:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTSGv-0005r8-5w for qemu-devel@nongnu.org; Fri, 07 Jul 2017 08:22:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dTSGu-0005qk-Vl for qemu-devel@nongnu.org; Fri, 07 Jul 2017 08:22:09 -0400 From: Cornelia Huck Date: Fri, 7 Jul 2017 14:21:55 +0200 Message-Id: <20170707122159.24714-4-cohuck@redhat.com> In-Reply-To: <20170707122159.24714-1-cohuck@redhat.com> References: <20170707122159.24714-1-cohuck@redhat.com> Subject: [Qemu-devel] [PATCH RFC 3/7] s390x/sclp: properly guard pci-specific functions 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, pmorel@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com, Cornelia Huck For non-pci builds, pci reconfiguration via sclp is not available. Don't indicate it in the sclp facilities and return an invalid command if the guest tries to issue pci configure/deconfigure. Signed-off-by: Cornelia Huck --- hw/s390x/sclp.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 83d6023894..d20baa3bbd 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -59,6 +59,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) int rnsize, rnmax; int slots = MIN(machine->ram_slots, s390_get_memslot_count(kvm_state)); IplParameterBlock *ipib = s390_ipl_get_iplb(); + uint64_t sclp_facilities = SCLP_HAS_CPU_INFO; CPU_FOREACH(cpu) { cpu_count++; @@ -79,8 +80,10 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) prepare_cpu_entries(sclp, read_info->entries, cpu_count); - read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO | - SCLP_HAS_PCI_RECONFIG); +#ifdef CONFIG_PCI + sclp_facilities |= SCLP_HAS_PCI_RECONFIG; +#endif + read_info->facilities = cpu_to_be64(sclp_facilities); /* Memory Hotplug is only supported for the ccw machine type */ if (mhd) { @@ -386,10 +389,18 @@ static void sclp_execute(SCLPDevice *sclp, SCCB *sccb, uint32_t code) sclp_c->unassign_storage(sclp, sccb); break; case SCLP_CMDW_CONFIGURE_PCI: +#ifdef CONFIG_PCI s390_pci_sclp_configure(sccb); +#else + sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); +#endif break; case SCLP_CMDW_DECONFIGURE_PCI: - s390_pci_sclp_deconfigure(sccb); +#ifdef CONFIG_PCI + sclp_c->pci_sclp_deconfigure(sccb); +#else + sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND); +#endif break; default: efc->command_handler(ef, sccb, code); -- 2.13.0