{"id":807750,"url":"http://patchwork.ozlabs.org/api/patches/807750/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-24-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-24-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:31","name":"[PULL,23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2383efec6769b2a424cf9df8422ee7a574838476","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-24-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807750/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807750/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBmT6LTpz9sPt\n\tfor ;\n\tThu, 31 Aug 2017 03:08:41 +1000 (AEST)","from localhost ([::1]:51686 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6Tn-0006lb-H3\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:08:39 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57275)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6GP-0002jv-Rm\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6GL-0005XT-Vq\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:49 -0400","from mx1.redhat.com ([209.132.183.28]:38354)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6GL-0005X0-N7\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:45 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 9BD295F7BB;\n\tWed, 30 Aug 2017 16:54:44 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id F295F8D573;\n\tWed, 30 Aug 2017 16:54:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 9BD295F7BB","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\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 30 Aug 2017 16:54:44 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from\n\ts390_get_memslot_count()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: David Hildenbrand \n\nNot needed at that point.\n\nSigned-off-by: David Hildenbrand \nMessage-Id: <20170818114353.13455-2-david@redhat.com>\nReviewed-by: Thomas Huth \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/sclp.c | 2 +-\n target/s390x/cpu.h | 8 ++++----\n target/s390x/kvm.c | 4 ++--\n 3 files changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c\nindex 7ae6a0e37a..ffdf4712a1 100644\n--- a/hw/s390x/sclp.c\n+++ b/hw/s390x/sclp.c\n@@ -57,7 +57,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)\n CPUState *cpu;\n int cpu_count = 0;\n int rnsize, rnmax;\n- int slots = MIN(machine->ram_slots, s390_get_memslot_count(kvm_state));\n+ int slots = MIN(machine->ram_slots, s390_get_memslot_count());\n IplParameterBlock *ipib = s390_ipl_get_iplb();\n \n CPU_FOREACH(cpu) {\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 29fdd5d49a..44b1a7ab71 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -1164,7 +1164,7 @@ void kvm_s390_enable_css_support(S390CPU *cpu);\n int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,\n int vq, bool assign);\n int kvm_s390_cpu_restart(S390CPU *cpu);\n-int kvm_s390_get_memslot_count(KVMState *s);\n+int kvm_s390_get_memslot_count(void);\n int kvm_s390_cmma_active(void);\n void kvm_s390_cmma_reset(void);\n int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state);\n@@ -1204,7 +1204,7 @@ static inline int kvm_s390_cpu_restart(S390CPU *cpu)\n static inline void kvm_s390_cmma_reset(void)\n {\n }\n-static inline int kvm_s390_get_memslot_count(KVMState *s)\n+static inline int kvm_s390_get_memslot_count(void)\n {\n return MAX_AVAIL_SLOTS;\n }\n@@ -1263,10 +1263,10 @@ static inline int s390_cpu_restart(S390CPU *cpu)\n return -ENOSYS;\n }\n \n-static inline int s390_get_memslot_count(KVMState *s)\n+static inline int s390_get_memslot_count(void)\n {\n if (kvm_enabled()) {\n- return kvm_s390_get_memslot_count(s);\n+ return kvm_s390_get_memslot_count();\n } else {\n return MAX_AVAIL_SLOTS;\n }\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex 9de165d8b1..d961fcf18b 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -2317,9 +2317,9 @@ int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch,\n return kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &kick);\n }\n \n-int kvm_s390_get_memslot_count(KVMState *s)\n+int kvm_s390_get_memslot_count(void)\n {\n- return kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS);\n+ return kvm_check_extension(kvm_state, KVM_CAP_NR_MEMSLOTS);\n }\n \n int kvm_s390_get_ri(void)\n","prefixes":["PULL","23/44"]}