From nobody Tue Jul 14 21:22:07 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=1783156951; cv=none; d=zohomail.com; s=zohoarc; b=Taw/JKxS+9ZobvoCWC0Z02Umrv8Av6RflLKq/b4FmnhsvUzWZHHtrKPN5NOO+dNayKDSnmHD/MZkiKhBbU2rEnrazMVII3jYhtFNyAQOV9NRVKJW7cgCEuCC+t6eWITQ/cVUo4AtD3LT67jQs9FPIUVm+fd1ZCnTiQYLMky+lVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783156951; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=0Qo35hWK8Mcm+O4MrNahPojpVcjGxkqiuSfF9P5C2V4=; b=dRME3wI6uC/MH0i0E1zBwbgnQA4jcXwKat+GenzXl+2jrLhsdpHE8osiwqHThBm2NyHf9XuyR2214NcR96pCipwq0z+JUQPYulOpwT0lCax+X4PH6HwxpaimNd2mYZw+6LTyxg6EdJ45QmmkdFOiM7of3IOiTpP5sc5wPeyMAfg= 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 178315695188857.769113078811415; Sat, 4 Jul 2026 02:22:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 63FCF41D19; Sat, 4 Jul 2026 05:22:29 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 8F16B41BBE; Sat, 4 Jul 2026 05:20:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E246641BBE; Sat, 4 Jul 2026 05:20:10 -0400 (EDT) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 99C6041BBB for ; Sat, 4 Jul 2026 05:20:09 -0400 (EDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-c12620ed112so167512566b.3 for ; Sat, 04 Jul 2026 02:20:09 -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-c12b62c4695sm392186366b.44.2026.07.04.02.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 02:20:07 -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=1783156808; x=1783761608; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Qo35hWK8Mcm+O4MrNahPojpVcjGxkqiuSfF9P5C2V4=; b=EeT6/9ohEfORQGP4OL6PhFQI7n4Aw4F5/dkTehPeVjKIMG/KGohiojkBVuv9tZXkyX Ug9aMXL3Z/cAUvOv6+64HdTOs3YzQPtq0nEwWXwDh5V3KOrEX3k1feQRbfh0Hn31xtH7 071lvaBKhdNvIajE5WVXdXaS0j2MbmuCtPcPEDPvJnymNhNpldwAkWpX2gLy8DVQ6bJB HJMzAvqwIUsZ6i+dUjRNvu1geq0m1toGt4JFS48bH/IyfrFxqyvXLpv9hVEC+zUGUBq/ zbOdp29X0XFOKSf/mlDjKiS/BKkSl6rzzOE57XkYXMfW9zarng0iuogcnf6JmVTEAItZ iW6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783156808; x=1783761608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0Qo35hWK8Mcm+O4MrNahPojpVcjGxkqiuSfF9P5C2V4=; b=TUaVDY1YKoC2fuMSeWrDvPlpa7w3VGlfZPf+4QkCs/NAeAV58RBXfz+EaLvGnGkKyp 7+jEzKGS+xNHYUfM+vZsrt22I75FJLS76BtqXS+hTsUtUgr1pfasCSsjgcK0SFusnYVy C3CsfoANmuw03L8vw3Ev+xAJLcfK/Y6aCxL1gv0QLWPAA95sywMO7J09QoAeIRUFmIj/ n588DMWPBpJay00z1JszSWRFStqYh1HRwoPDGrHKT4FYRlIcfxJv4eupSFWCwd2lI/U5 o/1pK8B9Oi2H/uWTZMeaCrxGArXyDM2PXl6WvmfkwIo2xa2y5nfjv8iMr9d9Rzy7/Hdu kVUw== X-Gm-Message-State: AOJu0YwISrtbYwlgsO+fwp4mjMtoiVSu7uxacwBv9aH0CJTrlTUOyPza S0MWnqRodL1o1MwaWjdYLCSXhbQeUIoqNj1Pjs24cYFWcY5TFsAOXkFRQ19pW1iP X-Gm-Gg: AfdE7ck9na/WAT0JKeaXb1pzVEvpFjjFxykOORZFvZr870Dd7UvPRozaXNXmUudiSml EaKuj1HEh55Sx+NSdDdKweU8jRMvay2EO9DsnXOu7KZv+1N5RCakw4W8i4f22p4DMvDz1jphkzh xL885TmG7BA9uGaS/iuASZYtv6hx9hY9WEBRrBeC8wonLw5o/I3RDlF2gbrDP69KE+OJmpgdXXZ rA7p2ks3jQrMSfu3k4DcqY6YE8D4QOy11wMLWIsZ/Gy+ssi42/7RtxPQd+L3Pt+xVCRWQO8qWtT 3BRneFd6zItnndPMgT/1WbMUVsBqfDy4vuDSpx96IWoLVswU1bxuVCjUFqDPiDKiQnc6GpC6Fif Z9XXAivcXIVWJoeisGtOAw9/Ebz8SIAeescAVA9ySo13dMk16FAGsDCtVu4xp4pNHuKt121Vavg QpP+Q6mjZ+Vkv2C/QklrmSTG7qOlFPoWCE1iwaTED6jQjNNprMMxSNtxTtuxrzaEhDLvXkAm4Ut dt9V2Fkcg9waEMtW6OwSjeZ/K6nt4dsqgfHmQ== X-Received: by 2002:a17:907:7b8f:b0:c12:7a8f:ed95 with SMTP id a640c23a62f3a-c12e6b97779mr83029566b.47.1783156807680; Sat, 04 Jul 2026 02:20:07 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 1/2] bhyve: implement the virDomainRename API Date: Sat, 4 Jul 2026 11:18:25 +0200 Message-ID: <20260704091826.98477-2-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260704091826.98477-1-bogorodskiy@gmail.com> References: <20260704091826.98477-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EB3C7D2JFAWEGOPZLK3YEQHDNN6RKKKO X-Message-ID-Hash: EB3C7D2JFAWEGOPZLK3YEQHDNN6RKKKO 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: 1783156953622158500 Content-Type: text/plain; charset="utf-8" Implementation is fairly similar to the one found in the test and qemu drivers. Lack of checkpoint and snapshot support in the bhyve driver makes the implementation a bit simpler. Signed-off-by: Roman Bogorodskiy Reviewed-by: Peter Krempa --- src/bhyve/bhyve_domain.c | 27 +++++++++ src/bhyve/bhyve_domain.h | 1 + src/bhyve/bhyve_driver.c | 122 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 86e4de1fd8..d5bb22501c 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -703,3 +703,30 @@ virBhyveDomainObjStopWorker(virDomainObj *dom) g_object_unref(eventThread); virObjectLock(dom); } + +int +bhyveDomainNamePathsCleanup(const char *name, + bool bestEffort) +{ + g_autofree char *cfg_file =3D NULL; + g_autofree char *autostart_link =3D NULL; + + cfg_file =3D virDomainConfigFile(BHYVE_CONFIG_DIR, name); + autostart_link =3D virDomainConfigFile(BHYVE_AUTOSTART_DIR, name); + + if (virFileExists(cfg_file) && + unlink(cfg_file) < 0) { + virReportSystemError(errno, _("Failed to unlink '%1$s'"), cfg_file= ); + if (!bestEffort) + return -1; + } + + if (virFileIsLink(autostart_link) =3D=3D 1 && + unlink(autostart_link) < 0) { + virReportSystemError(errno, _("Failed to unlink '%1$s'"), autostar= t_link); + if (!bestEffort) + return -1; + } + + return 0; +} diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h index 888ef2f84b..fa7a685d59 100644 --- a/src/bhyve/bhyve_domain.h +++ b/src/bhyve/bhyve_domain.h @@ -54,3 +54,4 @@ extern virXMLNamespace virBhyveDriverDomainXMLNamespace; =20 int virBhyveDomainObjStartWorker(virDomainObj *dom); void virBhyveDomainObjStopWorker(virDomainObj *dom); +int bhyveDomainNamePathsCleanup(const char *name, bool bestEffort); diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 45e8aad5b5..37a7617346 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2683,6 +2683,127 @@ bhyveDomainAuthorizedSSHKeysSet(virDomainPtr domain, return rv; } =20 +static int +bhyveDomainRenameCallback(virDomainObj *vm, + const char *new_name, + unsigned int flags, + void *opaque) +{ + struct _bhyveConn *privconn =3D opaque; + virObjectEvent *event_new =3D NULL; + virObjectEvent *event_old =3D NULL; + int ret =3D -1; + virErrorPtr err =3D NULL; + g_autofree char *new_dom_name =3D NULL; + g_autofree char *old_dom_name =3D NULL; + g_autofree char *new_dom_cfg_file =3D NULL; + g_autofree char *new_dom_autostart_link =3D NULL; + + virCheckFlags(0, ret); + + if (strchr(new_name, '/')) { + virReportError(VIR_ERR_XML_ERROR, + _("name %1$s cannot contain '/'"), new_name); + return -1; + } + + new_dom_name =3D g_strdup(new_name); + + new_dom_cfg_file =3D virDomainConfigFile(BHYVE_CONFIG_DIR, new_dom_nam= e); + + if (bhyveDomainNamePathsCleanup(new_name, false) < 0) + goto cleanup; + + if (vm->autostart) { + new_dom_autostart_link =3D virDomainConfigFile(BHYVE_AUTOSTART_DIR= , new_dom_name); + + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%1$s' to '%2= $s'"), + new_dom_autostart_link, new_dom_cfg_file); + return -1; + } + } + + /* Switch name in domain definition. */ + old_dom_name =3D vm->def->name; + vm->def->name =3D new_dom_name; + new_dom_name =3D NULL; + + if (virDomainDefSave(vm->def, privconn->xmlopt, BHYVE_CONFIG_DIR) < 0) + goto cleanup; + + event_old =3D virDomainEventLifecycleNew(vm->def->id, old_dom_name, vm= ->def->uuid, + 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); + virObjectEventStateQueue(privconn->domainEventState, event_old); + virObjectEventStateQueue(privconn->domainEventState, event_new); + ret =3D 0; + + 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) + virErrorPreserveLast(&err); + bhyveDomainNamePathsCleanup(ret < 0 ? new_dom_name : old_dom_name, tru= e); + virErrorRestore(&err); + return ret; +} + +static int +bhyveDomainRename(virDomainPtr domain, + const char *new_name, + unsigned int flags) +{ + struct _bhyveConn *privconn =3D domain->conn->privateData; + virDomainObj *vm =3D NULL; + int ret =3D -1; + + virCheckFlags(0, ret); + + if (!(vm =3D bhyveDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainRenameEnsureACL(domain->conn, vm->def) < 0) + goto cleanup; + + if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + goto cleanup; + + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot rename a transient domain")); + goto endjob; + } + + if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain has to be shutoff before renaming")= ); + goto endjob; + } + + if (virDomainObjListRename(privconn->domains, vm, new_name, flags, + bhyveDomainRenameCallback, privconn) < 0) + goto endjob; + + /* Success, domain has been renamed. */ + ret =3D 0; + + endjob: + virDomainObjEndJob(vm); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static virHypervisorDriver bhyveHypervisorDriver =3D { .name =3D "bhyve", .connectURIProbe =3D bhyveConnectURIProbe, @@ -2760,6 +2881,7 @@ static virHypervisorDriver bhyveHypervisorDriver =3D { .domainSetUserPassword =3D bhyveDomainSetUserPassword, /* 12.6.0 */ .domainAuthorizedSSHKeysGet =3D bhyveDomainAuthorizedSSHKeysGet, /* 12= .6.0 */ .domainAuthorizedSSHKeysSet =3D bhyveDomainAuthorizedSSHKeysSet, /* 12= .6.0 */ + .domainRename =3D bhyveDomainRename, /* 12.6.0 */ }; =20 =20 --=20 2.52.0 From nobody Tue Jul 14 21:22:07 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=1783157002; cv=none; d=zohomail.com; s=zohoarc; b=fjGfcshmMbuJEKSDHv0DuCoA9ydVeBBSitO3Y0eT8rMNB8twyco6RIDHJDuZM8mqnBusSflmEG8br0aPTtGILLFVJHjSCb1EugMFe8ay7ClQWtA1wOtF0YY1z3Xr4cxYKyowtUw9Y9ZsKguvHVFn3NmACtV68ckSVJ9EEmVdrWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783157002; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=SykL8KThkX6UP9vtySvRPhpcJ1eEYTR6qx9X6wjEmGA=; b=kRCi8fYk7bhenHx3rZNL5omONvse9NFEyXoBG4j/1IiSYYZX0eG28YjcILXwmzlHszcZT2C7wJWRec4IAvFwuJRUWe9DJq/ceOlCYYXlACj6GiUEmbq9o5OJtyUBVliGakrx/yxohokPHeowCM5nAywfVm+miJG6igKnvtPj0TY= 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 1783157002003804.8647518106146; Sat, 4 Jul 2026 02:23:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3C9F941C42; Sat, 4 Jul 2026 05:23:20 -0400 (EDT) Received: from [172.19.199.7] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id DFA9241D11; Sat, 4 Jul 2026 05:20:30 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 50FDF41BBA; Sat, 4 Jul 2026 05:20:11 -0400 (EDT) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 2CF4641BC0 for ; Sat, 4 Jul 2026 05:20:10 -0400 (EDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-c126eb4e003so132885666b.0 for ; Sat, 04 Jul 2026 02:20:10 -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-c12b62c4695sm392186366b.44.2026.07.04.02.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 02:20:07 -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=1783156808; x=1783761608; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SykL8KThkX6UP9vtySvRPhpcJ1eEYTR6qx9X6wjEmGA=; b=s2gr6foQskfYSdfrF9n9SQPb41XBqVH15c1EqNOduwjkq7OxILesqbvlQUgezQXD7c Ww1yVVCE8x9XhxCV3j2hQMegOVI0i9pBGUBKz7k5w/24H839i/LU+meQl5Xn2Nj5pNSu 84vl/FzHNxnozbcQaHE2ChRdcR3FMMKerPZlWWNLA2LXkh85l/hgahQbCdysKkR8N7O9 yPFUN6IMIyn7qQeTy62AKe/yXEgfIAquBwVE9nQqmgCiVCZ1yy21mHS/Kz9nV+r4Vu1L iAXj4tCicoceE+AC72eAuKJPduokguoqw47BPWjPKPPH+I9Y0HK4AxqGDAk2A236AyId M69w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783156808; x=1783761608; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SykL8KThkX6UP9vtySvRPhpcJ1eEYTR6qx9X6wjEmGA=; b=B5A1lwVe5QOU+6hTLxqfYIprg5d8iPBMCGy7e8YWqKKjwJ3zauX6tQU+NwXr5DV8PJ Y+sHYqav33e+IYNb0batDameLaLEg9uUWUwmbt1/OuSrz6reB/SWosXyIYYD1hvLzt9P cKk00njFYac8DZa533WXE2o/0xSJ8MDkYI+3tF+2+pcPFmdVJesUWpJ5jzTO8vsYP8NR PlXdCmQSNjjObqoWPatZNWhi2BKGg7z9s4lJtp+kIbQIvUntG3yfjsehHngsYjOqJIh7 1aBTkaXmnBrq8VqEQtceNTAStCqCL70gVc3IxdULpKKm5KDLfExuIJR19IS9R2ikhOvD 221g== X-Gm-Message-State: AOJu0Yy5QNIJ0/NC4OTkIWF7KI93Q3u9sfIrs5RG/DDCBbKxeXaOV/DY wovHqYfO/helX4+kV/oZlShXW7dyTf5BNLLnamAkoU+tnkrLtL40xfj0pBQgX8/0 X-Gm-Gg: AfdE7cmNWf7xA4NDbvQMFrxAKe6jB003Mqn0sJOFFuo8h6sdE6oFEjRwJWiKDeVPNIj pC8Wf56gz5QU6QB8XbIj0SiNNgDHaxyF+zMFU/v7zIIlgpwA9i8/4CazLTv8vffLIfKhcyn84pX okDGiIbKLtUfjpKC+s4Es5J+ScZoJQET+vh+hn3okc2jas2XeZKFm+6H23bpWdKGCWItiLhzunl 4gmi3R1vkybCyM31ZxtMLYoedjSDQbsc9M8GENrGcz2TkDdBGxTvBcstyUykqJ9Vu8AhTWR7+dX gpctU/yUC0jb/jwY3R6lMvxLF1DXZs3Nyf/paiw2hZdBBohx8ug7B0kXqUyefv5tgcG7rjClOMR 230yDNZcQelvm42reUHx5VKUJiIDau6eex+gxuG1aSteYKyjx3SVpMCOg/AhW2ZjKPtlMd3xHSQ NrHZW+REaU49SrqqZfdpMZhAz68dSQVkFyy/qSUXBG4ZWmYuStJWEdbvd0K4viIOT80Pz1ap8o7 wuk3Q0hfm+uxcYjQ/U1Yb0ps9I= X-Received: by 2002:a17:907:9729:b0:bef:db4:296e with SMTP id a640c23a62f3a-c12e691ab5bmr74721566b.10.1783156808150; Sat, 04 Jul 2026 02:20:08 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/2] qemu: qemuDomainRenameCallback: remove unused variables Date: Sat, 4 Jul 2026 11:18:26 +0200 Message-ID: <20260704091826.98477-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260704091826.98477-1-bogorodskiy@gmail.com> References: <20260704091826.98477-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UNAH57XHYUV2VBVAF6A7QKH55NXK3HBG X-Message-ID-Hash: UNAH57XHYUV2VBVAF6A7QKH55NXK3HBG 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: 1783157003750158500 Content-Type: text/plain; charset="utf-8" The old_dom_cfg_file and old_dom_autostart_link variables are assigned to, but never really used, so remove them. Signed-off-by: Roman Bogorodskiy Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ec9e1f9c4..3d57de389b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19029,9 +19029,7 @@ qemuDomainRenameCallback(virDomainObj *vm, g_autofree char *new_dom_name =3D NULL; g_autofree char *old_dom_name =3D NULL; g_autofree char *new_dom_cfg_file =3D NULL; - g_autofree char *old_dom_cfg_file =3D NULL; g_autofree char *new_dom_autostart_link =3D NULL; - g_autofree char *old_dom_autostart_link =3D NULL; struct qemuDomainMomentWriteMetadataData data =3D { .driver =3D driver, .vm =3D vm, @@ -19050,14 +19048,12 @@ qemuDomainRenameCallback(virDomainObj *vm, new_dom_name =3D g_strdup(new_name); =20 new_dom_cfg_file =3D virDomainConfigFile(cfg->configDir, new_dom_name); - old_dom_cfg_file =3D virDomainConfigFile(cfg->configDir, vm->def->name= ); =20 if (qemuDomainNamePathsCleanup(cfg, new_name, false) < 0) goto cleanup; =20 if (vm->autostart) { new_dom_autostart_link =3D virDomainConfigFile(cfg->autostartDir, = new_dom_name); - old_dom_autostart_link =3D virDomainConfigFile(cfg->autostartDir, = vm->def->name); =20 if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { virReportSystemError(errno, --=20 2.52.0