From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go9HR-0002nr-S6 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:57:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go95f-0002Dt-7a for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:44:51 -0500 From: Igor Mammedov Date: Mon, 28 Jan 2019 16:32:38 +0100 Message-Id: <1548689558-23960-1-git-send-email-imammedo@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3] s390x: remove direct reference to mem_path global form s390x code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pasic@linux.ibm.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com, rth@twiddle.net, david@redhat.com, philmd@redhat.com I plan to deprecate -mem-path option and replace it with memory-backend, for that it's necessary to get rid of mem_path global variable. Do it for s390x case, replacing it with alternative way to enable 1Mb hugepages capability. To do that, replace qemu_mempath_getpagesize() with qemu_getrampagesize() which also checks for -mem-path provided RAM. Signed-off-by: Igor Mammedov Reviewed-by: David Hildenbrand --- v3: fixup, typo in commit msg (Philippe Mathieu-Daud=C3=A9 ) v2: * s/qemu_mempath_getpagesize/qemu_getrampagesiz/ and drop the rest of c= hanges David Hildenbrand --- target/s390x/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 2ebf26a..90766fa 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -287,7 +287,7 @@ void kvm_s390_crypto_reset(void) =20 static int kvm_s390_configure_mempath_backing(KVMState *s) { - size_t path_psize =3D qemu_mempath_getpagesize(mem_path); + size_t path_psize =3D qemu_getrampagesize(); =20 if (path_psize =3D=3D 4 * KiB) { return 0; @@ -319,7 +319,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) { MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 - if (mem_path && kvm_s390_configure_mempath_backing(s)) { + if (kvm_s390_configure_mempath_backing(s)) { return -EINVAL; } =20 --=20 2.7.4