From nobody Thu Nov 6 01:19:37 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539093598849632.0585066978975; Tue, 9 Oct 2018 06:59:58 -0700 (PDT) Received: from localhost ([::1]:51728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9sYG-0006W8-QM for importer@patchew.org; Tue, 09 Oct 2018 09:59:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9sX1-0005of-OE for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9sWx-0007UB-OW for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:58:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9sWx-0007Qb-D4 for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:58:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 307CA315009E for ; Tue, 9 Oct 2018 13:58:32 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1643B7B8E2; Tue, 9 Oct 2018 13:58:09 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 9 Oct 2018 15:50:25 +0200 Message-Id: <1539093025-101599-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 09 Oct 2018 13:58:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] memory: move MemoryRegion::size cleanup to memory_region_finalize() 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: pbonzini@redhat.com, lersek@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It's not necessary to clean up MemoryRegion::size manually in multiple plac= es like it's been implemented in (1cd3d49262 "memory: cleanup side effects of memory_region_init_foo() on = failure") since each memory_region_init_foo() now calls object_unparent(mr) on failur= e, memory region destructor memory_region_finalize() will be called upon its completion for each memory_region_init_foo(). It's sufficient to clean MemoryRegion::size only from memory_region_finaliz= e(), so do it. Suggested-by: Laszlo Ersek Signed-off-by: Igor Mammedov Reviewed-by: Laszlo Ersek --- smoke tested with reproducer from 1cd3d49262, thing still works as expected --- memory.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/memory.c b/memory.c index d852f11..ad24b57 100644 --- a/memory.c +++ b/memory.c @@ -1491,7 +1491,6 @@ void memory_region_init_ram_shared_nomigrate(MemoryRe= gion *mr, mr->ram_block =3D qemu_ram_alloc(size, share, mr, &err); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1516,7 +1515,6 @@ void memory_region_init_resizeable_ram(MemoryRegion *= mr, mr, &err); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1541,7 +1539,6 @@ void memory_region_init_ram_from_file(MemoryRegion *m= r, mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = &err); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1565,7 +1562,6 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, fd, &err); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1628,7 +1624,6 @@ void memory_region_init_rom_nomigrate(MemoryRegion *m= r, mr->ram_block =3D qemu_ram_alloc(size, false, mr, &err); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1652,7 +1647,6 @@ void memory_region_init_rom_device_nomigrate(MemoryRe= gion *mr, mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc(size, false, mr, &err); if (err) { - mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); error_propagate(errp, err); } @@ -1701,6 +1695,7 @@ static void memory_region_finalize(Object *obj) memory_region_clear_coalescing(mr); g_free((char *)mr->name); g_free(mr->ioeventfds); + mr->size =3D int128_zero(); } =20 Object *memory_region_owner(MemoryRegion *mr) --=20 2.7.4