From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766526645278531.3911929700954; Tue, 23 Dec 2025 13:50:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGc-0002rg-FC; Tue, 23 Dec 2025 16:50:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGb-0002rQ-90 for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:05 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGZ-0006sE-Bx for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:04 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 20CF0596A0A; Tue, 23 Dec 2025 22:49:59 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id XQJD2YBg3dbH; Tue, 23 Dec 2025 22:49:57 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 0EBE85969FA; Tue, 23 Dec 2025 22:49:57 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 1/6] memory: Add internal memory_region_set_ops helper function To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:49:57 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526651509158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a common operation used at multiple places, add a helper function for it. Signed-off-by: BALATON Zoltan --- system/memory.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/system/memory.c b/system/memory.c index 8b84661ae3..a003095632 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1559,6 +1559,15 @@ MemTxResult memory_region_dispatch_write(MemoryRegio= n *mr, } } =20 +static void memory_region_set_ops(MemoryRegion *mr, + const MemoryRegionOps *ops, + void *opaque) +{ + mr->ops =3D ops ?: &unassigned_mem_ops; + mr->opaque =3D opaque; + mr->terminates =3D true; +} + void memory_region_init_io(MemoryRegion *mr, Object *owner, const MemoryRegionOps *ops, @@ -1567,9 +1576,7 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size) { memory_region_init(mr, owner, name, size); - mr->ops =3D ops ? ops : &unassigned_mem_ops; - mr->opaque =3D opaque; - mr->terminates =3D true; + memory_region_set_ops(mr, ops, opaque); } =20 bool memory_region_init_ram_nomigrate(MemoryRegion *mr, @@ -1710,10 +1717,8 @@ void memory_region_init_ram_device_ptr(MemoryRegion = *mr, { memory_region_init(mr, owner, name, size); mr->ram =3D true; - mr->terminates =3D true; mr->ram_device =3D true; - mr->ops =3D &ram_device_mem_ops; - mr->opaque =3D mr; + memory_region_set_ops(mr, &ram_device_mem_ops, mr); mr->destructor =3D memory_region_destructor_ram; =20 /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ @@ -1759,9 +1764,7 @@ bool memory_region_init_rom_device_nomigrate(MemoryRe= gion *mr, Error *err =3D NULL; assert(ops); memory_region_init(mr, owner, name, size); - mr->ops =3D ops; - mr->opaque =3D opaque; - mr->terminates =3D true; + memory_region_set_ops(mr, ops, opaque); mr->rom_device =3D true; mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc(size, 0, mr, &err); --=20 2.41.3 From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766526662514488.61490086742606; Tue, 23 Dec 2025 13:51:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGe-0002st-Rm; Tue, 23 Dec 2025 16:50:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGd-0002sJ-2j for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:07 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGZ-0006sP-BT for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:06 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 2002E596A0E; Tue, 23 Dec 2025 22:50:00 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id MT1E4ZRimBNP; Tue, 23 Dec 2025 22:49:58 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 1B080596A07; Tue, 23 Dec 2025 22:49:58 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 2/6] memory: Factor out common ram region initialization To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:49:58 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526666752158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Introduce internal memory_region_do_init_ram() function to remove duplicated code from different memory_region_init_*ram functions. Signed-off-by: BALATON Zoltan --- system/memory.c | 147 +++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 94 deletions(-) diff --git a/system/memory.c b/system/memory.c index a003095632..87c8e78662 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1579,29 +1579,12 @@ void memory_region_init_io(MemoryRegion *mr, memory_region_set_ops(mr, ops, opaque); } =20 -bool memory_region_init_ram_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) -{ - return memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp); -} - -bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint32_t ram_flags, - Error **errp) +static bool memory_region_do_init_ram(MemoryRegion *mr, + Error *err, Error **errp) { - Error *err =3D NULL; - memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, ram_flags, mr, &err); if (err) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); @@ -1611,6 +1594,25 @@ bool memory_region_init_ram_flags_nomigrate(MemoryRe= gion *mr, return true; } =20 +bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr, Object *owne= r, + const char *name, uint64_t siz= e, + uint32_t ram_flags, Error **er= rp) +{ + Error *err =3D NULL; + + memory_region_init(mr, owner, name, size); + mr->ram_block =3D qemu_ram_alloc(size, ram_flags, mr, &err); + return memory_region_do_init_ram(mr, err, errp); +} + +bool memory_region_init_ram_nomigrate(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + Error **errp) +{ + return memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, + errp); +} + bool memory_region_init_resizeable_ram(MemoryRegion *mr, Object *owner, const char *name, @@ -1622,108 +1624,66 @@ bool memory_region_init_resizeable_ram(MemoryRegio= n *mr, Error **errp) { Error *err =3D NULL; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc_resizeable(size, max_size, resized, - mr, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + mr->ram_block =3D qemu_ram_alloc_resizeable(size, max_size, resized, m= r, + &err); + return memory_region_do_init_ram(mr, err, errp); } =20 #if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN) -bool memory_region_init_ram_from_file(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint64_t align, - uint32_t ram_flags, - const char *path, - ram_addr_t offset, +bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + uint64_t align, uint32_t ram_flags, + const char *path, ram_addr_t offset, Error **errp) { Error *err =3D NULL; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; mr->align =3D align; - mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, - offset, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = offset, + &err); + return memory_region_do_init_ram(mr, err, errp); } =20 -bool memory_region_init_ram_from_fd(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - uint32_t ram_flags, - int fd, - ram_addr_t offset, - Error **errp) +bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + uint32_t ram_flags, int fd, + ram_addr_t offset, Error **errp) { Error *err =3D NULL; + memory_region_init(mr, owner, name, size); - mr->ram =3D true; mr->readonly =3D !!(ram_flags & RAM_READONLY); - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_fla= gs, fd, offset, false, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; - } - return true; + return memory_region_do_init_ram(mr, err, errp); } #endif =20 -void memory_region_init_ram_ptr(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - void *ptr) +void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, void *ptr) { memory_region_init(mr, owner, name, size); - mr->ram =3D true; - mr->terminates =3D true; - mr->destructor =3D memory_region_destructor_ram; - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + memory_region_do_init_ram(mr, NULL, NULL); } =20 -void memory_region_init_ram_device_ptr(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, void *ptr) { memory_region_init(mr, owner, name, size); - mr->ram =3D true; - mr->ram_device =3D true; memory_region_set_ops(mr, &ram_device_mem_ops, mr); - mr->destructor =3D memory_region_destructor_ram; - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); + memory_region_do_init_ram(mr, NULL, NULL); + mr->ram_device =3D true; } =20 void memory_region_init_alias(MemoryRegion *mr, @@ -1762,19 +1722,18 @@ bool memory_region_init_rom_device_nomigrate(Memory= Region *mr, Error **errp) { Error *err =3D NULL; + bool ret; + assert(ops); memory_region_init(mr, owner, name, size); memory_region_set_ops(mr, ops, opaque); - mr->rom_device =3D true; - mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc(size, 0, mr, &err); - if (err) { - mr->size =3D int128_zero(); - object_unparent(OBJECT(mr)); - error_propagate(errp, err); - return false; + ret =3D memory_region_do_init_ram(mr, err, errp); + if (ret) { + mr->ram =3D false; + mr->rom_device =3D true; } - return true; + return ret; } =20 void memory_region_init_iommu(void *_iommu_mr, --=20 2.41.3 From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766526663063354.928356291054; Tue, 23 Dec 2025 13:51:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGd-0002sS-BB; Tue, 23 Dec 2025 16:50:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGc-0002rk-He for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:06 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGZ-0006t1-CT for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:06 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 23192596A0B; Tue, 23 Dec 2025 22:50:01 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id Ku661s1qJXSz; Tue, 23 Dec 2025 22:49:59 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 27F37596A0D; Tue, 23 Dec 2025 22:49:59 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: <6a6918fb8b1e1f207485ea25fd8bc9161fe5c32b.1766525089.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 3/6] memory: Factor out more common ram region initialization To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:49:59 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526666669158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Introduce internal memory_region_do_init_ram_ptr() function to remove duplicated code from different memory_region_init_ram_*ptr functions. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/memory.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/system/memory.c b/system/memory.c index 87c8e78662..3d538fb9af 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1663,26 +1663,29 @@ bool memory_region_init_ram_from_fd(MemoryRegion *m= r, Object *owner, } #endif =20 -void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner, - const char *name, uint64_t size, void *ptr) +static void memory_region_do_init_ram_ptr(MemoryRegion *mr, uint64_t size, + void *ptr) { - memory_region_init(mr, owner, name, size); /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); memory_region_do_init_ram(mr, NULL, NULL); } =20 +void memory_region_init_ram_ptr(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, void *ptr) +{ + memory_region_init(mr, owner, name, size); + memory_region_do_init_ram_ptr(mr, size, ptr); +} + void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, void *ptr) { memory_region_init(mr, owner, name, size); memory_region_set_ops(mr, &ram_device_mem_ops, mr); - /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ - assert(ptr !=3D NULL); - mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); - memory_region_do_init_ram(mr, NULL, NULL); + memory_region_do_init_ram_ptr(mr, size, ptr); mr->ram_device =3D true; } =20 --=20 2.41.3 From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766526688653213.52224809204074; Tue, 23 Dec 2025 13:51:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGd-0002sK-61; Tue, 23 Dec 2025 16:50:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGb-0002rR-96 for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:05 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGZ-0006tn-By for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:05 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 32627596A03; Tue, 23 Dec 2025 22:50:02 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id ZoGEs03-kd50; Tue, 23 Dec 2025 22:50:00 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 33007596A07; Tue, 23 Dec 2025 22:50:00 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: <5b4c9ebe17612ae45e6df24ba1d510f4b4e3b98d.1766525089.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 4/6] memory: Shorten memory_region_init_rom_nomigrate To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:50:00 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526689545158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the shortcut memory_region_init_ram_nomigrate as we have no flags to pass and remove some extra line breaks to make the function occupy less lines. Also shorten some other function prototypes. Signed-off-by: BALATON Zoltan --- system/memory.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/system/memory.c b/system/memory.c index 3d538fb9af..bff9677f7a 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1568,12 +1568,9 @@ static void memory_region_set_ops(MemoryRegion *mr, mr->terminates =3D true; } =20 -void memory_region_init_io(MemoryRegion *mr, - Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size) +void memory_region_init_io(MemoryRegion *mr, Object *owner, + const MemoryRegionOps *ops, void *opaque, + const char *name, uint64_t size) { memory_region_init(mr, owner, name, size); memory_region_set_ops(mr, ops, opaque); @@ -1689,30 +1686,23 @@ void memory_region_init_ram_device_ptr(MemoryRegion= *mr, Object *owner, mr->ram_device =3D true; } =20 -void memory_region_init_alias(MemoryRegion *mr, - Object *owner, - const char *name, - MemoryRegion *orig, - hwaddr offset, - uint64_t size) +void memory_region_init_alias(MemoryRegion *mr, Object *owner, + const char *name, MemoryRegion *orig, + hwaddr offset, uint64_t size) { memory_region_init(mr, owner, name, size); mr->alias =3D orig; mr->alias_offset =3D offset; } =20 -bool memory_region_init_rom_nomigrate(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +bool memory_region_init_rom_nomigrate(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, Error **errp) { - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, - size, 0, errp)) { - return false; + if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) { + return false; } mr->readonly =3D true; - return true; } =20 --=20 2.41.3 From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766526645303658.1550023425365; Tue, 23 Dec 2025 13:50:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGf-0002tz-Ux; Tue, 23 Dec 2025 16:50:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGe-0002sm-JV for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:08 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGc-000763-Qr for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:08 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 4B555597323; Tue, 23 Dec 2025 22:50:03 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id BgyKRMGzgd0W; Tue, 23 Dec 2025 22:50:01 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 43BB3596A0D; Tue, 23 Dec 2025 22:50:01 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 5/6] memory: Add internal memory_region_register_ram function To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:50:01 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526651544158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Factor out common operation from memory_region_init_{ram,rom} functions to register the region for migration. This avoids duplicating the long comment in several functions. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/memory.c | 75 +++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/system/memory.c b/system/memory.c index bff9677f7a..74244be130 100644 --- a/system/memory.c +++ b/system/memory.c @@ -3678,17 +3678,10 @@ void mtree_info(bool flatview, bool dispatch_tree, = bool owner, bool disabled) } } =20 -bool memory_region_init_ram(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - Error **errp) +static void memory_region_register_ram(MemoryRegion *mr, Object *owner) { DeviceState *owner_dev; =20 - if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) { - return false; - } /* This will assert if owner is neither NULL nor a DeviceState. * We only want the owner here for the purposes of defining a * unique name for migration. TODO: Ideally we should implement @@ -3697,80 +3690,52 @@ bool memory_region_init_ram(MemoryRegion *mr, */ owner_dev =3D DEVICE(owner); vmstate_register_ram(mr, owner_dev); +} =20 +bool memory_region_init_ram(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, + Error **errp) +{ + if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) { + return false; + } + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; - if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, size, RAM_GUEST_MEMFD, errp)) { return false; } - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_rom(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, +bool memory_region_init_rom(MemoryRegion *mr, Object *owner, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; - if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) { return false; } - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 -bool memory_region_init_rom_device(MemoryRegion *mr, - Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size, +bool memory_region_init_rom_device(MemoryRegion *mr, Object *owner, + const MemoryRegionOps *ops, void *opaqu= e, + const char *name, uint64_t size, Error **errp) { - DeviceState *owner_dev; - if (!memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque, name, size, errp)) { return false; } - /* This will assert if owner is neither NULL nor a DeviceState. - * We only want the owner here for the purposes of defining a - * unique name for migration. TODO: Ideally we should implement - * a naming scheme for Objects which are not DeviceStates, in - * which case we can relax this restriction. - */ - owner_dev =3D DEVICE(owner); - vmstate_register_ram(mr, owner_dev); - + memory_region_register_ram(mr, owner); return true; } =20 --=20 2.41.3 From nobody Sat Feb 7 05:44:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176652668343727.272206435126918; Tue, 23 Dec 2025 13:51:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAGh-0002ug-Ad; Tue, 23 Dec 2025 16:50:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGf-0002tT-Kl for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:09 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vYAGc-000764-8u for qemu-devel@nongnu.org; Tue, 23 Dec 2025 16:50:09 -0500 Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 69769597366; Tue, 23 Dec 2025 22:50:04 +0100 (CET) Received: from zero.eik.bme.hu ([127.0.0.1]) by localhost (zero.eik.bme.hu [127.0.0.1]) (amavis, port 10028) with ESMTP id W6D93gmj164b; Tue, 23 Dec 2025 22:50:02 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 4D7EC59731F; Tue, 23 Dec 2025 22:50:02 +0100 (CET) X-Virus-Scanned: amavis at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 6/6] memory: Add memory_region_new* functions To: qemu-devel@nongnu.org Cc: Peter Xu , Akihiko Odaki , Paolo Bonzini , Michael S. Tsirkin , philmd@linaro.org Date: Tue, 23 Dec 2025 22:50:02 +0100 (CET) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1766526685750158500 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" These are counterparts of similar memory_region_init* functions but differ in that these allocate the memory region with object_new so the memory region will be managed by QOM and freed with the owner. This behaviour was already documented and the reference tracking is implemented but it could not be used without these functions because memory_region_init* functions call object_initialize that resets the free function of the object so it would not be freed. Signed-off-by: BALATON Zoltan --- include/system/memory.h | 360 ++++++++++++++++++++++++++++++++++++++++ system/memory.c | 212 +++++++++++++++++++++++ 2 files changed, 572 insertions(+) diff --git a/include/system/memory.h b/include/system/memory.h index 3bd5ffa5e0..5bdaa52355 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1763,6 +1763,366 @@ bool memory_region_init_rom_device(MemoryRegion *mr, uint64_t size, Error **errp); =20 +/** + * memory_region_new: Allocate and initialize a memory region + * + * This is like memory_region_init() but allocates the #MemoryRegion and + * attaches it to the owner to free it when the owner is freed. + * + * @owner: the object that tracks the region's reference count + * @name: used for debugging; not visible to the user or ABI + * @size: size of the region; any subregions beyond this size will be clip= ped + * + * Return: Pointer to the allocated #MemoryRegion. + */ +MemoryRegion *memory_region_new(Object *owner, + const char *name, uint64_t size); + +/** + * memory_region_new_io: Allocate and initialize an I/O memory region. + * + * This is like memory_region_init_io() but allocates the #MemoryRegion and + * attaches it to the owner to free it when the owner is freed. + * + * @owner: the object that tracks the region's reference count + * @ops: a structure containing read and write callbacks to be used when + * I/O is performed on the region. + * @opaque: passed to the read and write callbacks of the @ops structure. + * @name: used for debugging; not visible to the user or ABI + * @size: size of the region. + * + * Return: Pointer to the allocated #MemoryRegion. + */ +MemoryRegion *memory_region_new_io(Object *owner, + const MemoryRegionOps *ops, void *opaqu= e, + const char *name, uint64_t size); + +/** + * memory_region_new_ram_nomigrate: Allocate and initialize RAM memory re= gion. + * + * This is like memory_region_init_ram_nomigrate() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_ram_nomigrate(Object *owner, + const char *name, uint64_t s= ize, + Error **errp); + +/** + * memory_region_new_ram_flags_nomigrate: Allocata and initialize RAM mem= ory + * region with flags. + * + * This is like memory_region_init_ram_flags_nomigrate() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_NORESERVE, + * RAM_GUEST_MEMFD. + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_ram_flags_nomigrate(Object *owner, + const char *name, + uint64_t size, + uint32_t ram_flags, + Error **errp); + +/** + * memory_region_new_resizeable_ram: Allocate and initialize memory region + * with resizable RAM. + * + * This is like memory_region_init_resizable_ram() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: used size of the region. + * @max_size: max size of the region. + * @resized: callback to notify owner about used size change. + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_resizeable_ram(Object *owner, + const char *name, + uint64_t size, + uint64_t max_size, + void (*resized)(const char*, + uint64_t le= ngth, + void *host), + Error **errp); + +/** + * memory_region_new_ram_from_file: Allocate and initialize RAM memory re= gion + * with a mmap-ed backend. + * + * This is like memory_region_init_ram_from_file() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @align: alignment of the region base address; if 0, the default alignme= nt + * (getpagesize()) will be used. + * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, + * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, + * RAM_READONLY_FD, RAM_GUEST_MEMFD + * @path: the path in which to allocate the RAM. + * @offset: offset within the file referenced by path + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_ram_from_file(Object *owner, + const char *name, + uint64_t size, + uint64_t align, + uint32_t ram_flags, + const char *path, + ram_addr_t offset, + Error **errp); + +/** + * memory_region_new_ram_from_fd: Allocate and initialize RAM memory regi= on + * with a mmap-ed backend. + * + * This is like memory_region_init_ram_from_fd() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: the name of the region. + * @size: size of the region. + * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, + * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, + * RAM_READONLY_FD, RAM_GUEST_MEMFD + * @fd: the fd to mmap. + * @offset: offset within the file referenced by fd + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_ram_from_fd(Object *owner, + const char *name, uint64_t siz= e, + uint32_t ram_flags, int fd, + ram_addr_t offset, Error **err= p); + +/** + * memory_region_new_ram_ptr: Allocate and initialize RAM memory region f= rom a + * user-provided pointer. + * + * This is like memory_region_init_ram_ptr() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @ptr: memory to be mapped; must contain at least @size bytes. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * + * Return: Pointer to the allocated #MemoryRegion + */ +MemoryRegion *memory_region_new_ram_ptr(Object *owner, const char *name, + uint64_t size, void *ptr); + +/** + * memory_region_new_ram_device_ptr: Allocate and initialize RAM device m= emory + * region from a user-provided pointer. + * + * This is like memory_region_init_ram_device_ptr() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: the name of the region. + * @size: size of the region. + * @ptr: memory to be mapped; must contain at least @size bytes. + * + * Note that this function does not do anything to cause the data in the + * RAM memory region to be migrated; that is the responsibility of the cal= ler. + * (For RAM device memory regions, migrating the contents rarely makes sen= se.) + * + * Return: Pointer to the allocated #MemoryRegion + */ +MemoryRegion *memory_region_new_ram_device_ptr(Object *owner, const char *= name, + uint64_t size, void *ptr); + +/** + * memory_region_new_alias: Allocate and initialize a memory region that + * aliases all or a part of another memory regio= n. + * + * This is like memory_region_init_alias() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: used for debugging; not visible to the user or ABI + * @orig: the region to be referenced; @mr will be equivalent to + * @orig between @offset and @offset + @size - 1. + * @offset: start of the section in @orig to be referenced. + * @size: size of the region. + * + * Return: Pointer to the allocated #MemoryRegion + */ +MemoryRegion *memory_region_new_alias(Object *owner, + const char *name, MemoryRegion *orig, + hwaddr offset, uint64_t size); + +/** + * memory_region_new_rom_nomigrate: Allocate and initialize a ROM memory + * region. + * + * This is like memory_region_init_rom_nomigrate() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_rom_nomigrate(Object *owner, + const char *name, uint64_t s= ize, + Error **errp); + +/** + * memory_region_new_rom_device_nomigrate: Allocate and initialize a ROM + * device memory region. + * + * This is like memory_region_init_rom_device_nomigrate() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count + * @ops: callbacks for write access handling (must not be NULL). + * @opaque: passed to the read and write callbacks of the @ops structure. + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. + * + * Note that this function does not do anything to cause the data in the + * RAM side of the memory region to be migrated; that is the responsibility + * of the caller. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_rom_device_nomigrate(Object *owner, + const MemoryRegionOps= *ops, + void *opaque, + const char *name, + uint64_t size, + Error **errp); +/** + * memory_region_new_ram - Allocate and initialize RAM memory region. + * + * This is like memory_region_init_ram() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * @owner: the object that tracks the region's reference count (must be + * TYPE_DEVICE or a subclass of TYPE_DEVICE, or NULL) + * @name: name of the memory region + * @size: size of the region in bytes + * @errp: pointer to Error*, to store an error if it happens. + * + * TODO: Currently we restrict @owner to being either NULL (for + * global RAM regions with no owner) or devices, so that we can + * give the RAM block a unique name for migration purposes. + * We should lift this restriction and allow arbitrary Objects. + * If you pass a non-NULL non-device @owner then we will assert. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_ram(Object *owner, + const char *name, uint64_t size, + Error **errp); + +MemoryRegion *memory_region_new_ram_guest_memfd(Object *owner, + const char *name, + uint64_t size, + Error **errp); + +/** + * memory_region_new_rom: Allocate and initialize a ROM memory region. + * + * This is like memory_region_init_rom() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * TODO: Currently we restrict @owner to being either NULL (for + * global RAM regions with no owner) or devices, so that we can + * give the RAM block a unique name for migration purposes. + * We should lift this restriction and allow arbitrary Objects. + * If you pass a non-NULL non-device @owner then we will assert. + * + * @owner: the object that tracks the region's reference count + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_rom(Object *owner, + const char *name, uint64_t size, + Error **errp); + +/** + * memory_region_new_rom_device: Allocate and initialize a ROM device mem= ory + * region. + * + * This is like memory_region_init_rom_device() but allocates the + * #MemoryRegion and attaches is to the owner to free when the owner is fr= eed. + * + * TODO: Currently we restrict @owner to being either NULL (for + * global RAM regions with no owner) or devices, so that we can + * give the RAM block a unique name for migration purposes. + * We should lift this restriction and allow arbitrary Objects. + * If you pass a non-NULL non-device @owner then we will assert. + * + * @owner: the object that tracks the region's reference count + * @ops: callbacks for write access handling (must not be NULL). + * @opaque: passed to the read and write callbacks of the @ops structure. + * @name: Region name, becomes part of RAMBlock name used in migration str= eam + * must be unique within any device + * @size: size of the region. + * @errp: pointer to Error*, to store an error if it happens. + * + * Return: Pointer to the allocated #MemoryRegion or NULL on error. + */ +MemoryRegion *memory_region_new_rom_device(Object *owner, + const MemoryRegionOps *ops, + void *opaque, + const char *name, uint64_t size, + Error **errp); =20 /** * memory_region_owner: get a memory region's owner. diff --git a/system/memory.c b/system/memory.c index 74244be130..c5fe65db03 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1251,6 +1251,15 @@ void memory_region_init(MemoryRegion *mr, memory_region_do_init(mr, owner, name, size); } =20 +MemoryRegion *memory_region_new(Object *owner, const char *name, uint64_t = size) +{ + MemoryRegion *mr =3D MEMORY_REGION(object_new(TYPE_MEMORY_REGION)); + + assert(name); /* mr is attached to owner by name */ + memory_region_do_init(mr, owner, name, size); + return mr; +} + static void memory_region_get_container(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -1576,6 +1585,16 @@ void memory_region_init_io(MemoryRegion *mr, Object = *owner, memory_region_set_ops(mr, ops, opaque); } =20 +MemoryRegion *memory_region_new_io(Object *owner, + const MemoryRegionOps *ops, void *opaqu= e, + const char *name, uint64_t size) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + + memory_region_set_ops(mr, ops, opaque); + return mr; +} + static bool memory_region_do_init_ram(MemoryRegion *mr, Error *err, Error **errp) { @@ -1610,6 +1629,26 @@ bool memory_region_init_ram_nomigrate(MemoryRegion *= mr, Object *owner, errp); } =20 +MemoryRegion *memory_region_new_ram_flags_nomigrate(Object *owner, + const char *name, + uint64_t size, + uint32_t ram_flags, + Error **errp) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + Error *err =3D NULL; + + mr->ram_block =3D qemu_ram_alloc(size, ram_flags, mr, &err); + return memory_region_do_init_ram(mr, err, errp) ? mr : NULL; +} + +MemoryRegion *memory_region_new_ram_nomigrate(Object *owner, + const char *name, uint64_t s= ize, + Error **errp) +{ + return memory_region_new_ram_flags_nomigrate(owner, name, size, 0, err= p); +} + bool memory_region_init_resizeable_ram(MemoryRegion *mr, Object *owner, const char *name, @@ -1628,6 +1667,23 @@ bool memory_region_init_resizeable_ram(MemoryRegion = *mr, return memory_region_do_init_ram(mr, err, errp); } =20 +MemoryRegion *memory_region_new_resizeable_ram(Object *owner, + const char *name, + uint64_t size, + uint64_t max_size, + void (*resized)(const char*, + uint64_t le= ngth, + void *host), + Error **errp) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + Error *err =3D NULL; + + mr->ram_block =3D qemu_ram_alloc_resizeable(size, max_size, resized, m= r, + &err); + return memory_region_do_init_ram(mr, err, errp) ? mr : NULL; +} + #if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN) bool memory_region_init_ram_from_file(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, @@ -1645,6 +1701,25 @@ bool memory_region_init_ram_from_file(MemoryRegion *= mr, Object *owner, return memory_region_do_init_ram(mr, err, errp); } =20 +MemoryRegion *memory_region_new_ram_from_file(Object *owner, + const char *name, + uint64_t size, + uint64_t align, + uint32_t ram_flags, + const char *path, + ram_addr_t offset, + Error **errp) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + Error *err =3D NULL; + + mr->readonly =3D !!(ram_flags & RAM_READONLY); + mr->align =3D align; + mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = offset, + &err); + return memory_region_do_init_ram(mr, err, errp) ? mr : NULL; +} + bool memory_region_init_ram_from_fd(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, uint32_t ram_flags, int fd, @@ -1658,6 +1733,20 @@ bool memory_region_init_ram_from_fd(MemoryRegion *mr= , Object *owner, offset, false, &err); return memory_region_do_init_ram(mr, err, errp); } + +MemoryRegion *memory_region_new_ram_from_fd(Object *owner, + const char *name, uint64_t siz= e, + uint32_t ram_flags, int fd, + ram_addr_t offset, Error **err= p) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + Error *err =3D NULL; + + mr->readonly =3D !!(ram_flags & RAM_READONLY); + mr->ram_block =3D qemu_ram_alloc_from_fd(size, size, NULL, mr, ram_fla= gs, fd, + offset, false, &err); + return memory_region_do_init_ram(mr, err, errp) ? mr : NULL; +} #endif =20 static void memory_region_do_init_ram_ptr(MemoryRegion *mr, uint64_t size, @@ -1676,6 +1765,15 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, Ob= ject *owner, memory_region_do_init_ram_ptr(mr, size, ptr); } =20 +MemoryRegion *memory_region_new_ram_ptr(Object *owner, const char *name, + uint64_t size, void *ptr) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + + memory_region_do_init_ram_ptr(mr, size, ptr); + return mr; +} + void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, void *ptr) @@ -1686,6 +1784,17 @@ void memory_region_init_ram_device_ptr(MemoryRegion = *mr, Object *owner, mr->ram_device =3D true; } =20 +MemoryRegion *memory_region_new_ram_device_ptr(Object *owner, const char *= name, + uint64_t size, void *ptr) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + + memory_region_set_ops(mr, &ram_device_mem_ops, mr); + memory_region_do_init_ram_ptr(mr, size, ptr); + mr->ram_device =3D true; + return mr; +} + void memory_region_init_alias(MemoryRegion *mr, Object *owner, const char *name, MemoryRegion *orig, hwaddr offset, uint64_t size) @@ -1695,6 +1804,17 @@ void memory_region_init_alias(MemoryRegion *mr, Obje= ct *owner, mr->alias_offset =3D offset; } =20 +MemoryRegion *memory_region_new_alias(Object *owner, + const char *name, MemoryRegion *orig, + hwaddr offset, uint64_t size) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + + mr->alias =3D orig; + mr->alias_offset =3D offset; + return mr; +} + bool memory_region_init_rom_nomigrate(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, Error **errp) @@ -1706,6 +1826,20 @@ bool memory_region_init_rom_nomigrate(MemoryRegion *= mr, Object *owner, return true; } =20 +MemoryRegion *memory_region_new_rom_nomigrate(Object *owner, + const char *name, uint64_t s= ize, + Error **errp) +{ + MemoryRegion *mr; + + mr =3D memory_region_new_ram_nomigrate(owner, name, size, errp); + if (!mr) { + return NULL; + } + mr->readonly =3D true; + return mr; +} + bool memory_region_init_rom_device_nomigrate(MemoryRegion *mr, Object *owner, const MemoryRegionOps *ops, @@ -1729,6 +1863,27 @@ bool memory_region_init_rom_device_nomigrate(MemoryR= egion *mr, return ret; } =20 +MemoryRegion *memory_region_new_rom_device_nomigrate(Object *owner, + const MemoryRegionOps= *ops, + void *opaque, + const char *name, + uint64_t size, + Error **errp) +{ + MemoryRegion *mr =3D memory_region_new(owner, name, size); + Error *err =3D NULL; + + assert(ops); + memory_region_set_ops(mr, ops, opaque); + mr->ram_block =3D qemu_ram_alloc(size, 0, mr, &err); + if (memory_region_do_init_ram(mr, err, errp)) { + mr->ram =3D false; + mr->rom_device =3D true; + return mr; + } + return NULL; +} + void memory_region_init_iommu(void *_iommu_mr, size_t instance_size, const char *mrtypename, @@ -3703,6 +3858,19 @@ bool memory_region_init_ram(MemoryRegion *mr, Object= *owner, return true; } =20 +MemoryRegion *memory_region_new_ram(Object *owner, + const char *name, uint64_t size, + Error **errp) +{ + MemoryRegion *mr; + + mr =3D memory_region_new_ram_nomigrate(owner, name, size, errp); + if (mr) { + memory_region_register_ram(mr, owner); + } + return mr; +} + bool memory_region_init_ram_guest_memfd(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, Error **errp) @@ -3715,6 +3883,21 @@ bool memory_region_init_ram_guest_memfd(MemoryRegion= *mr, Object *owner, return true; } =20 +MemoryRegion *memory_region_new_ram_guest_memfd(Object *owner, + const char *name, + uint64_t size, + Error **errp) +{ + MemoryRegion *mr; + + mr =3D memory_region_new_ram_flags_nomigrate(owner, name, size, + RAM_GUEST_MEMFD, errp); + if (mr) { + memory_region_register_ram(mr, owner); + } + return mr; +} + bool memory_region_init_rom(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, Error **errp) @@ -3726,6 +3909,19 @@ bool memory_region_init_rom(MemoryRegion *mr, Object= *owner, return true; } =20 +MemoryRegion *memory_region_new_rom(Object *owner, + const char *name, uint64_t size, + Error **errp) +{ + MemoryRegion *mr; + + mr =3D memory_region_new_rom_nomigrate(owner, name, size, errp); + if (mr) { + memory_region_register_ram(mr, owner); + } + return mr; +} + bool memory_region_init_rom_device(MemoryRegion *mr, Object *owner, const MemoryRegionOps *ops, void *opaqu= e, const char *name, uint64_t size, @@ -3739,6 +3935,22 @@ bool memory_region_init_rom_device(MemoryRegion *mr,= Object *owner, return true; } =20 +MemoryRegion *memory_region_new_rom_device(Object *owner, + const MemoryRegionOps *ops, + void *opaque, + const char *name, uint64_t size, + Error **errp) +{ + MemoryRegion *mr; + + mr =3D memory_region_new_rom_device_nomigrate(owner, ops, opaque, name= , size, + errp); + if (mr) { + memory_region_register_ram(mr, owner); + } + return mr; +} + /* * Support system builds with CONFIG_FUZZ using a weak symbol and a stub f= or * the fuzz_dma_read_cb callback --=20 2.41.3