From nobody Tue Jul 14 21:22:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1783965399; cv=none; d=zohomail.com; s=zohoarc; b=DauuuIw3g2f7ncFj/1b1ORZNtEODgH8EATviKqEBFUivN9254DqKXuwj0I4aSu+G2GMCsndbO9VLEPaBom8rs/hdxKtKJJ9WZfJMr9m903xEOv82R9qGHZhmpPTPHItGs4FcJXgiWX6GckH14REHwYAMjme7ZC35HyeV31eDNKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783965399; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=d6HhQIe+ft/E3qt+3iw32dlG3lOv5tYkzL7FUtNLqqk=; b=m5PkOQfE8fO6ZSaHbQ1G3Gdf4ASakxxMTxI1Wu83XP5MxhiJBVRL1B0/8IzRyXKpUMpaKnUi5Lpz/igZ0jYIp1Y3QcHAksgwL/EpdHwbW1TxTLigt26HP09ZtRPMaqVPHPac3F4NIhecO8mvKrLTchSBtEFpGwZuqrR8vUn2VuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1783965399507156.37170560897846; Mon, 13 Jul 2026 10:56:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3147D41D9E; Mon, 13 Jul 2026 13:56:38 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 878F541CEB; Mon, 13 Jul 2026 13:55:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id AB78C41BF8; Mon, 13 Jul 2026 13:55:38 -0400 (EDT) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BC4B341AC6 for ; Mon, 13 Jul 2026 13:55:37 -0400 (EDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-c15b33f7b23so490584666b.3 for ; Mon, 13 Jul 2026 10:55:37 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-ee82-4536-a8f2-9e22.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:ee82:4536:a8f2:9e22]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c15d4bffdbesm823741166b.45.2026.07.13.10.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 10:55:35 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783965336; x=1784570136; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=d6HhQIe+ft/E3qt+3iw32dlG3lOv5tYkzL7FUtNLqqk=; b=cbdGlox15hzHK5WXIS+Xo/+OjVoTSkU4EZ/Yz1JnPrPgUIOxrbbhcpIyIfdgZqRfqy nQJvp00PMrRRpqrTlMpNqzRI3LiVpY4mZ5+cFaniWOcbhPIEYwL9jATef98jrnS9NuYX DledCPgNS8K5KGhZ2ukN37g2pTwVYyqbOtfu547qGLjKpV3YOaz+sSmdvJZVzIJqx5G/ Ax5LwpTuoNbYxES62iiHIWBfWjp6Hb73i5Don4f8shY6jM1sLHGoaSRFlBrw8Fetc8ly f0mmeziHS1nVJlmx09D9Xn9pkeJQQK4WCRESDFUFTJaJGg0RojEFwVRyTmDKI1y1vem5 G4dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783965336; x=1784570136; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=d6HhQIe+ft/E3qt+3iw32dlG3lOv5tYkzL7FUtNLqqk=; b=ddNgkt3VlyZBMKB0U5H7SIQocy0ItoL70q9tarqvxXlaby9jqkyCN4UY1M+f2biDkh dasxKXmPUJwJZ2y86L7/VL7iSoEFdbJzZjcZOvyA43DOIUqVhsSkKHdXuBh/XiGBPo8c OsMUFA/Cw7O4sFP+/l4DU4b8hQQXeh8xwy4+a5e9gprQWr48FOawMyFN6IFKbXwR8bZg rbZCy/F3yujQetw7oEN7F79Hn4fK7mayg6E5OVcmORvktW5yus6sUzwYB//+xdZfJh/S VhIXWxC45RzhgPIt7AxLkMNyB10EC1pX6IYGZg/a+E+88UDk7wqq71VaunRSYm20lniV pSTA== X-Gm-Message-State: AOJu0Yx/o4H87DeM0OgR92dsF4n+Hpyc3oxXkDpPog9GwCFDHWqAlKyr 8n/9mdjByvrGuolmKkdv9zR7hX+0BDtI5I9SQGZUGkoEPHU5ssveNNru/hngv3xe X-Gm-Gg: AfdE7cl9iEpc8/sB6vaiXh1bTz0DrHPtKR9hOnkmm9JIIEiV0pm5x7bM5uTYymCZ8m6 nE1GXmQ33k/0pTqCGxsFRT59GGW9XkkmYAzfmLFc4nEUEYpbppJjtEDniiouYpjjSZP7TFPH0Ub fBuT0y9vY5NZQoEOWYgEKp37CMN/+Ig+RrvJ7d5YAHkVq7K/0XrIkWgW3XOO1bbFVv0lPSFtfsj cNX3oPRNtIIEhPsCmlJJydtCM8n+Pjcd7DUc5i96tEd93fbc7AJi5FcDFo6A6snRSvCly8woF6z wz1DmZXLTeStv098B2ibFHsWCISoVt6Q/AC4HiY6jKp5ODr/fidX4DJBW5JKov2MBln7wSUpUuh gXzuvysTlS0F0rotYsD7ZABNY9np/2P+pOYS9viJrxgHMgt4alOy9k8p3Hwf2S8sn8DIZjxVC4I K0aJrqCliznhx5Q+AQFcJ9Nu5TRRPgxHPd44AluIi6496JXdtJ55sOteFs5tG7rOgDzxR4ntgfH 2S5AeQK6OuA38yHabKNGiPtU5M= X-Received: by 2002:a17:907:cf87:b0:c12:992e:184b with SMTP id a640c23a62f3a-c161e9af448mr438646666b.26.1783965335896; Mon, 13 Jul 2026 10:55:35 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH] qemu: qemuDomainRenameCallback: tidy up Date: Mon, 13 Jul 2026 19:55:12 +0200 Message-ID: <20260713175512.66263-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UQPRELHT5DUVIKSAUFAOBKPYB42QP5JT X-Message-ID-Hash: UQPRELHT5DUVIKSAUFAOBKPYB42QP5JT X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1783965400501158500 Content-Type: text/plain; charset="utf-8" A few non-functional changes improving overall readability: - Use g_steal_pointer() for domain name switch code. - Clean up the 'cleanup' handler. - Fix indent for virDomainEventLifecycleNewFromObj() arguments. Signed-off-by: Roman Bogorodskiy Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3d57de389b..6c124672d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19064,9 +19064,8 @@ qemuDomainRenameCallback(virDomainObj *vm, } =20 /* Switch name in domain definition. */ - old_dom_name =3D vm->def->name; - vm->def->name =3D new_dom_name; - new_dom_name =3D NULL; + old_dom_name =3D g_steal_pointer(&vm->def->name); + vm->def->name =3D g_steal_pointer(&new_dom_name); =20 if (virDomainSnapshotForEach(vm->snapshots, qemuDomainSnapshotWriteMetadataIter, @@ -19085,22 +19084,25 @@ qemuDomainRenameCallback(virDomainObj *vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENA= MED); event_new =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_DEFINED, - VIR_DOMAIN_EVENT_DEFINED_REN= AMED); + VIR_DOMAIN_EVENT_DEFINED, + VIR_DOMAIN_EVENT_DEFINED= _RENAMED); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); ret =3D 0; =20 cleanup: - if (old_dom_name && ret < 0) { - new_dom_name =3D vm->def->name; - vm->def->name =3D old_dom_name; - old_dom_name =3D NULL; - } + if (ret < 0) { + if (old_dom_name) { + new_dom_name =3D vm->def->name; + vm->def->name =3D old_dom_name; + old_dom_name =3D NULL; + } =20 - if (ret < 0) virErrorPreserveLast(&err); - qemuDomainNamePathsCleanup(cfg, ret < 0 ? new_dom_name : old_dom_name,= true); + qemuDomainNamePathsCleanup(cfg, new_dom_name, true); + } else { + qemuDomainNamePathsCleanup(cfg, old_dom_name, true); + } virErrorRestore(&err); return ret; } --=20 2.52.0