From nobody Wed Nov 5 08:43:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504112993398240.5865663303838; Wed, 30 Aug 2017 10:09:53 -0700 (PDT) Received: from localhost ([::1]:51690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6Ux-0007sQ-FP for importer@patchew.org; Wed, 30 Aug 2017 13:09:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6GP-0002jv-Rm for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn6GL-0005XT-Vq for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn6GL-0005X0-N7 for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BD295F7BB; Wed, 30 Aug 2017 16:54:44 +0000 (UTC) Received: from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F295F8D573; Wed, 30 Aug 2017 16:54:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9BD295F7BB Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=cohuck@redhat.com From: Cornelia Huck To: peter.maydell@linaro.org Date: Wed, 30 Aug 2017 18:52:31 +0200 Message-Id: <20170830165252.13421-24-cohuck@redhat.com> In-Reply-To: <20170830165252.13421-1-cohuck@redhat.com> References: <20170830165252.13421-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 30 Aug 2017 16:54:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count() 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: thuth@redhat.com, david@redhat.com, Cornelia Huck , agraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand Not needed at that point. Signed-off-by: David Hildenbrand Message-Id: <20170818114353.13455-2-david@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Cornelia Huck --- hw/s390x/sclp.c | 2 +- target/s390x/cpu.h | 8 ++++---- target/s390x/kvm.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 7ae6a0e37a..ffdf4712a1 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -57,7 +57,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) CPUState *cpu; int cpu_count =3D 0; int rnsize, rnmax; - int slots =3D MIN(machine->ram_slots, s390_get_memslot_count(kvm_state= )); + int slots =3D MIN(machine->ram_slots, s390_get_memslot_count()); IplParameterBlock *ipib =3D s390_ipl_get_iplb(); =20 CPU_FOREACH(cpu) { diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 29fdd5d49a..44b1a7ab71 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -1164,7 +1164,7 @@ void kvm_s390_enable_css_support(S390CPU *cpu); int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch, int vq, bool assign); int kvm_s390_cpu_restart(S390CPU *cpu); -int kvm_s390_get_memslot_count(KVMState *s); +int kvm_s390_get_memslot_count(void); int kvm_s390_cmma_active(void); void kvm_s390_cmma_reset(void); int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state); @@ -1204,7 +1204,7 @@ static inline int kvm_s390_cpu_restart(S390CPU *cpu) static inline void kvm_s390_cmma_reset(void) { } -static inline int kvm_s390_get_memslot_count(KVMState *s) +static inline int kvm_s390_get_memslot_count(void) { return MAX_AVAIL_SLOTS; } @@ -1263,10 +1263,10 @@ static inline int s390_cpu_restart(S390CPU *cpu) return -ENOSYS; } =20 -static inline int s390_get_memslot_count(KVMState *s) +static inline int s390_get_memslot_count(void) { if (kvm_enabled()) { - return kvm_s390_get_memslot_count(s); + return kvm_s390_get_memslot_count(); } else { return MAX_AVAIL_SLOTS; } diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 9de165d8b1..d961fcf18b 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2317,9 +2317,9 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *no= tifier, uint32_t sch, return kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick); } =20 -int kvm_s390_get_memslot_count(KVMState *s) +int kvm_s390_get_memslot_count(void) { - return kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS); + return kvm_check_extension(kvm_state, KVM_CAP_NR_MEMSLOTS); } =20 int kvm_s390_get_ri(void) --=20 2.13.5