From nobody Sun Apr 28 18:57:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548956912866343.6786193431594; Thu, 31 Jan 2019 09:48:32 -0800 (PST) Received: from localhost ([127.0.0.1]:58180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpGRx-0008Kk-Sy for importer@patchew.org; Thu, 31 Jan 2019 12:48:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpGQt-0007qH-NC for qemu-devel@nongnu.org; Thu, 31 Jan 2019 12:47:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpGQr-0008NQ-NX for qemu-devel@nongnu.org; Thu, 31 Jan 2019 12:47:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47658) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpGQl-0008Kl-R2; Thu, 31 Jan 2019 12:47:17 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 09FA68AE6E; Thu, 31 Jan 2019 17:47:13 +0000 (UTC) Received: from thuth.com (ovpn-116-123.ams2.redhat.com [10.36.116.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 574C25C229; Thu, 31 Jan 2019 17:47:11 +0000 (UTC) From: Thomas Huth To: Collin Walling , Cornelia Huck , qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 18:47:08 +0100 Message-Id: <1548956828-10210-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 31 Jan 2019 17:47:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/s390x: Fix the function arguments in the pci stub file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The arguments of the stub functions to not match the real implementation (and the prototypes in the header) anymore, so if you try to compile s390x without CONFIG_PCI, the build currently fails. Signed-off-by: Thomas Huth --- hw/s390x/s390-pci-stub.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c index ad4c5a7..145759e 100644 --- a/hw/s390x/s390-pci-stub.c +++ b/hw/s390x/s390-pci-stub.c @@ -29,38 +29,40 @@ void s390_pci_sclp_deconfigure(SCCB *sccb) } =20 /* target/s390x/kvm.c */ -int clp_service_call(S390CPU *cpu, uint8_t r2) +int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) { return -1; } =20 -int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) +int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra) { return -1; } =20 -int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) +int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra) { return -1; } =20 -int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t = ar) +int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t = ar, + uintptr_t ra) { return -1; } =20 -int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) +int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra) { return -1; } =20 int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gad= dr, - uint8_t ar) + uint8_t ar, uintptr_t ra) { return -1; } =20 -int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t a= r) +int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t a= r, + uintptr_t ra) { return -1; } --=20 1.8.3.1