{"id":807754,"url":"http://patchwork.ozlabs.org/api/patches/807754/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-25-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-25-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:32","name":"[PULL,24/44] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f6338fc4675269b35596c84d00f225b72a6c9b76","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-25-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/807754/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807754/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xjBqh40RZz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 03:11:28 +1000 (AEST)","from localhost ([::1]:51699 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6WU-00016w-8d\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:11:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57293)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6GR-0002ml-Cl\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6GQ-0005a2-CY\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:51 -0400","from mx1.redhat.com ([209.132.183.28]:50618)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6GQ-0005Z4-3q\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:50 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 05B4A7E42F;\n\tWed, 30 Aug 2017 16:54:49 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 8BB2E87CAA;\n\tWed, 30 Aug 2017 16:54:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 05B4A7E42F","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:32 +0200","Message-Id":"<20170830165252.13421-25-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.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 30 Aug 2017 16:54:49 +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 24/44] s390x/kvm: drop KVMState parameter from\n\tkvm_s390_set_mem_limit()","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. Also drop it from kvm_s390_query_mem_limit()\nwe call in kvm_s390_set_mem_limit().\n\nSigned-off-by: David Hildenbrand \nMessage-Id: <20170818114353.13455-3-david@redhat.com>\nReviewed-by: Thomas Huth \nSigned-off-by: Cornelia Huck \n---\n target/s390x/cpu.h | 7 +++----\n target/s390x/kvm.c | 12 ++++++------\n 2 files changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 44b1a7ab71..798e299db1 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -1169,7 +1169,7 @@ 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 void kvm_s390_reset_vcpu(S390CPU *cpu);\n-int kvm_s390_set_mem_limit(KVMState *s, uint64_t new_limit, uint64_t *hw_limit);\n+int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);\n void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);\n int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu);\n int kvm_s390_get_ri(void);\n@@ -1215,8 +1215,7 @@ static inline int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state)\n static inline void kvm_s390_reset_vcpu(S390CPU *cpu)\n {\n }\n-static inline int kvm_s390_set_mem_limit(KVMState *s, uint64_t new_limit,\n- uint64_t *hw_limit)\n+static inline int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)\n {\n return 0;\n }\n@@ -1243,7 +1242,7 @@ static inline void kvm_s390_crypto_reset(void)\n static inline int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit)\n {\n if (kvm_enabled()) {\n- return kvm_s390_set_mem_limit(kvm_state, new_limit, hw_limit);\n+ return kvm_s390_set_mem_limit(new_limit, hw_limit);\n }\n return 0;\n }\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex d961fcf18b..23109a7c76 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -145,7 +145,7 @@ static int active_cmma;\n \n static void *legacy_s390_alloc(size_t size, uint64_t *align);\n \n-static int kvm_s390_query_mem_limit(KVMState *s, uint64_t *memory_limit)\n+static int kvm_s390_query_mem_limit(uint64_t *memory_limit)\n {\n struct kvm_device_attr attr = {\n .group = KVM_S390_VM_MEM_CTRL,\n@@ -153,10 +153,10 @@ static int kvm_s390_query_mem_limit(KVMState *s, uint64_t *memory_limit)\n .addr = (uint64_t) memory_limit,\n };\n \n- return kvm_vm_ioctl(s, KVM_GET_DEVICE_ATTR, &attr);\n+ return kvm_vm_ioctl(kvm_state, KVM_GET_DEVICE_ATTR, &attr);\n }\n \n-int kvm_s390_set_mem_limit(KVMState *s, uint64_t new_limit, uint64_t *hw_limit)\n+int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)\n {\n int rc;\n \n@@ -166,18 +166,18 @@ int kvm_s390_set_mem_limit(KVMState *s, uint64_t new_limit, uint64_t *hw_limit)\n .addr = (uint64_t) &new_limit,\n };\n \n- if (!kvm_vm_check_mem_attr(s, KVM_S390_VM_MEM_LIMIT_SIZE)) {\n+ if (!kvm_vm_check_mem_attr(kvm_state, KVM_S390_VM_MEM_LIMIT_SIZE)) {\n return 0;\n }\n \n- rc = kvm_s390_query_mem_limit(s, hw_limit);\n+ rc = kvm_s390_query_mem_limit(hw_limit);\n if (rc) {\n return rc;\n } else if (*hw_limit < new_limit) {\n return -E2BIG;\n }\n \n- return kvm_vm_ioctl(s, KVM_SET_DEVICE_ATTR, &attr);\n+ return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);\n }\n \n int kvm_s390_cmma_active(void)\n","prefixes":["PULL","24/44"]}