From nobody Thu Nov 6 14:16:23 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.zoho.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 148915143802677.39745034579005; Fri, 10 Mar 2017 05:10:38 -0800 (PST) Received: from localhost ([::1]:39065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmKJU-0002CZ-IM for importer@patchew.org; Fri, 10 Mar 2017 08:10:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmKIn-0002BF-MF for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmKIm-00020e-FE for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cmKIm-00020N-9h for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:48 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 85D837F342; Fri, 10 Mar 2017 13:09:48 +0000 (UTC) Received: from pxdev.xzpeter.org.com (ovpn-8-39.pek2.redhat.com [10.72.8.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0096A2D653; Fri, 10 Mar 2017 13:09:44 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 10 Mar 2017 21:09:29 +0800 Message-Id: <1489151370-15453-2-git-send-email-peterx@redhat.com> In-Reply-To: <1489151370-15453-1-git-send-email-peterx@redhat.com> References: <1489151370-15453-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 10 Mar 2017 13:09:48 +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] [PATCH 1/2] hostmem: introduce host_memory_backend_mr_inited() 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: Peter Maydell , Paolo Bonzini , Eduardo Habkost , peterx@redhat.com, Igor Mammedov 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" We were checking this against memory region size of host memory backend's mr field to see whether the mr has been inited. This is efficient but less elegant. Let's make a helper for it to avoid confusions, along with some notes. Suggested-by: Peter Maydell Signed-off-by: Peter Xu Reviewed-by: Eduardo Habkost --- backends/hostmem.c | 9 +++++++++ include/sysemu/hostmem.h | 1 + 2 files changed, 10 insertions(+) diff --git a/backends/hostmem.c b/backends/hostmem.c index 7f5de70..4e9ef62 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -243,6 +243,15 @@ static void host_memory_backend_init(Object *obj) backend->prealloc =3D mem_prealloc; } =20 +bool host_memory_backend_mr_inited(HostMemoryBackend *backend) +{ + /* + * NOTE: We forbid zero-length memory backend, so here zero means + * "we haven't inited the backend memory region yet". + */ + return memory_region_size(&backend->mr) !=3D 0; +} + MemoryRegion * host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) { diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index ecae0cf..ed6a437 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -62,6 +62,7 @@ struct HostMemoryBackend { MemoryRegion mr; }; =20 +bool host_memory_backend_mr_inited(HostMemoryBackend *backend); MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp); =20 --=20 2.7.4 From nobody Thu Nov 6 14:16:23 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.zoho.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 148915151280195.92305447058482; Fri, 10 Mar 2017 05:11:52 -0800 (PST) Received: from localhost ([::1]:39074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmKKj-0003Do-Kn for importer@patchew.org; Fri, 10 Mar 2017 08:11:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmKIu-0002GE-OS for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmKIr-000223-GK for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35238) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cmKIr-00021m-7s for qemu-devel@nongnu.org; Fri, 10 Mar 2017 08:09:53 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7860F7E9CC; Fri, 10 Mar 2017 13:09:53 +0000 (UTC) Received: from pxdev.xzpeter.org.com (ovpn-8-39.pek2.redhat.com [10.72.8.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B92E2D653; Fri, 10 Mar 2017 13:09:48 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 10 Mar 2017 21:09:30 +0800 Message-Id: <1489151370-15453-3-git-send-email-peterx@redhat.com> In-Reply-To: <1489151370-15453-1-git-send-email-peterx@redhat.com> References: <1489151370-15453-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 10 Mar 2017 13:09:53 +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] [PATCH 2/2] hostmem: use host_memory_backend_mr_inited() where proper 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: Peter Maydell , Paolo Bonzini , Eduardo Habkost , peterx@redhat.com, Igor Mammedov 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" Use the new interface to boost readability. Signed-off-by: Peter Xu Reviewed-by: Eduardo Habkost --- backends/hostmem-file.c | 6 +++--- backends/hostmem.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 42efb2f..fc4ef46 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -51,7 +51,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) #ifndef CONFIG_LINUX error_setg(errp, "-mem-path not supported on this host"); #else - if (!memory_region_size(&backend->mr)) { + if (!host_memory_backend_mr_inited(backend)) { gchar *path; backend->force_prealloc =3D mem_prealloc; path =3D object_get_canonical_path(OBJECT(backend)); @@ -76,7 +76,7 @@ static void set_mem_path(Object *o, const char *str, Erro= r **errp) HostMemoryBackend *backend =3D MEMORY_BACKEND(o); HostMemoryBackendFile *fb =3D MEMORY_BACKEND_FILE(o); =20 - if (memory_region_size(&backend->mr)) { + if (host_memory_backend_mr_inited(backend)) { error_setg(errp, "cannot change property value"); return; } @@ -96,7 +96,7 @@ static void file_memory_backend_set_share(Object *o, bool= value, Error **errp) HostMemoryBackend *backend =3D MEMORY_BACKEND(o); HostMemoryBackendFile *fb =3D MEMORY_BACKEND_FILE(o); =20 - if (memory_region_size(&backend->mr)) { + if (host_memory_backend_mr_inited(backend)) { error_setg(errp, "cannot change property value"); return; } diff --git a/backends/hostmem.c b/backends/hostmem.c index 4e9ef62..07137a2 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -45,7 +45,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, con= st char *name, Error *local_err =3D NULL; uint64_t value; =20 - if (memory_region_size(&backend->mr)) { + if (host_memory_backend_mr_inited(backend)) { error_setg(&local_err, "cannot change property value"); goto out; } @@ -152,7 +152,7 @@ static void host_memory_backend_set_merge(Object *obj, = bool value, Error **errp) { HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); =20 - if (!memory_region_size(&backend->mr)) { + if (!host_memory_backend_mr_inited(backend)) { backend->merge =3D value; return; } @@ -178,7 +178,7 @@ static void host_memory_backend_set_dump(Object *obj, b= ool value, Error **errp) { HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); =20 - if (!memory_region_size(&backend->mr)) { + if (!host_memory_backend_mr_inited(backend)) { backend->dump =3D value; return; } @@ -214,7 +214,7 @@ static void host_memory_backend_set_prealloc(Object *ob= j, bool value, } } =20 - if (!memory_region_size(&backend->mr)) { + if (!host_memory_backend_mr_inited(backend)) { backend->prealloc =3D value; return; } @@ -255,7 +255,7 @@ bool host_memory_backend_mr_inited(HostMemoryBackend *b= ackend) MemoryRegion * host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) { - return memory_region_size(&backend->mr) ? &backend->mr : NULL; + return host_memory_backend_mr_inited(backend) ? &backend->mr : NULL; } =20 void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mappe= d) --=20 2.7.4