From nobody Sun Feb 8 09:42:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743433512; cv=none; d=zohomail.com; s=zohoarc; b=X1NIQBm5Vy7Ls2Bps7lIoY1hUe9EZOLqQIR/l9a/NhtlE8MrqnNsneZRk9HcmR5slprQIiF4Elk1bMAKxVcy3lRKw2+spBzk0mJFwuZRbqLu5ZIOz5hFa2pDQSvFm1vCX1hZezxkxwWndc1mRNPKKd+NCY/2yIprogAqJfAFxIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743433512; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=inS3LGNOkjyTTvHe/V26f4zrSwswhlSD/KKLWHTQ2/0=; b=jm28J1+rmQMy+RPAn4nrftUTfrQGiYC4szV6Xc48ABkczsQwVVh61U8/t3BK+MF9xYdiYQBEucEuEmX+pJe4hjJnL8Q5/J1eZglLUJHv1w2MkHV91USHAO9Uwzrp7e5o/zK5T0oAs5DD9LuDP3WUUIxsE58bCBLSJoBuGwtMyJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743433512418695.2052084483032; Mon, 31 Mar 2025 08:05:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BCBAA1256; Mon, 31 Mar 2025 11:05:11 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8C9A81326; Mon, 31 Mar 2025 11:04:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7FFD21183; Mon, 31 Mar 2025 11:04:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 942C41183 for ; Mon, 31 Mar 2025 11:04:11 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-P4FIsVvrMreMy4RnNaJKKg-1; Mon, 31 Mar 2025 11:04:08 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1206A180034D for ; Mon, 31 Mar 2025 15:04:08 +0000 (UTC) Received: from kshcheti-thinkpadp1gen4i.tpbc.com (unknown [10.43.2.246]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2139F1955BEF; Mon, 31 Mar 2025 15:04:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743433451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AJ6L63sUX3XzBBwO+Yn8fpf4W7K6Xd4hLFqnaYJaaFQ=; b=eBCXcTQuKp+mzhlIH2SaYf3wU0PRtMhWLaQ/5S3khz1ukfGMwo98MrdJQ0f3coYuYXOdWT E5QT/+DoQAhMV0EWq6No3NfCEfiuyT25irXmYGLFkHRhMyWcPqTD1oKSJD4eJCGcvJU6Vu KJX5LBvLrYW/u69q/hwY3tzSI2ylvuc= X-MC-Unique: P4FIsVvrMreMy4RnNaJKKg-1 X-Mimecast-MFC-AGG-ID: P4FIsVvrMreMy4RnNaJKKg_1743433448 To: devel@lists.libvirt.org Subject: [PATCH 1/4] ch: add persistent definition save and load Date: Mon, 31 Mar 2025 17:01:38 +0200 Message-ID: <20250331150359.276206-2-kshcheti@redhat.com> In-Reply-To: <20250331150359.276206-1-kshcheti@redhat.com> References: <20250331150359.276206-1-kshcheti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 2WLHroEzGzXCTskFgk7htxOuvosRYsmPWP26c6RHse0_1743433448 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WGW5SHXWWRNZ5ZWM5CPVGDGPFTXTMHYQ X-Message-ID-Hash: WGW5SHXWWRNZ5ZWM5CPVGDGPFTXTMHYQ X-MailFrom: kshcheti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Kirill Shchetiniuk X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Kirill Shchetiniuk via Devel Reply-To: Kirill Shchetiniuk X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743433513576019000 Content-Type: text/plain; charset="utf-8"; x-default="true" When the domain was defined, its persistent domain definition wasn't saved on disk, leading to the loss of all defined domains after a CH driver restart. Now all defined persistent domains are saved on disk and loaded from disk during CH driver initialization. Saved domains now also can be removed with undefine. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/743 Signed-off-by: Kirill Shchetiniuk --- src/ch/ch_conf.c | 10 +++++++--- src/ch/ch_conf.h | 2 ++ src/ch/ch_driver.c | 24 +++++++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index cab97639c4..f0cb963656 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -149,11 +149,11 @@ virCHDriverConfigNew(bool privileged) cfg->logDir =3D g_strdup_printf("%s/log/libvirt/ch", LOCALSTATEDIR= ); cfg->stateDir =3D g_strdup_printf("%s/libvirt/ch", RUNSTATEDIR); cfg->saveDir =3D g_strdup_printf("%s/lib/libvirt/ch/save", LOCALST= ATEDIR); + cfg->configBaseDir =3D g_strdup_printf("%s/libvirt", SYSCONFDIR); =20 } else { g_autofree char *rundir =3D NULL; g_autofree char *cachedir =3D NULL; - g_autofree char *configbasedir =3D NULL; =20 cachedir =3D virGetUserCacheDirectory(); =20 @@ -162,10 +162,12 @@ virCHDriverConfigNew(bool privileged) rundir =3D virGetUserRuntimeDirectory(); cfg->stateDir =3D g_strdup_printf("%s/ch/run", rundir); =20 - configbasedir =3D virGetUserConfigDirectory(); - cfg->saveDir =3D g_strdup_printf("%s/ch/save", configbasedir); + cfg->configBaseDir =3D virGetUserConfigDirectory(); + cfg->saveDir =3D g_strdup_printf("%s/ch/save", cfg->configBaseDir); } =20 + cfg->configDir =3D g_strdup_printf("%s/ch", cfg->configBaseDir); + return cfg; } =20 @@ -183,6 +185,8 @@ virCHDriverConfigDispose(void *obj) g_free(cfg->saveDir); g_free(cfg->stateDir); g_free(cfg->logDir); + g_free(cfg->configBaseDir); + g_free(cfg->configDir); } =20 #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h index b08573476e..8beeb69b95 100644 --- a/src/ch/ch_conf.h +++ b/src/ch/ch_conf.h @@ -40,6 +40,8 @@ struct _virCHDriverConfig { char *stateDir; char *logDir; char *saveDir; + char *configBaseDir; + char *configDir; =20 int cgroupControllers; =20 diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 3bdcf66ebd..c7f357dac9 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -338,6 +338,7 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEvent *event =3D NULL; + g_autoptr(virCHDriverConfig) cfg =3D virCHDriverGetConfig(driver); g_autofree char *managed_save_path =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 @@ -370,6 +371,11 @@ chDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) goto cleanup; } =20 + /* Save new persistent domain definition */ + if (virDomainDefSave(vm->newDef ? vm->newDef : vm->def, + driver->xmlopt, cfg->configDir) < 0) + goto cleanup; + vm->persistent =3D 1; event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, @@ -398,6 +404,7 @@ chDomainUndefineFlags(virDomainPtr dom, virCHDriver *driver =3D dom->conn->privateData; virDomainObj *vm; virObjectEvent *event =3D NULL; + g_autoptr(virCHDriverConfig) cfg =3D NULL; int ret =3D -1; =20 virCheckFlags(0, -1); @@ -405,6 +412,8 @@ chDomainUndefineFlags(virDomainPtr dom, if (!(vm =3D virCHDomainObjFromDomain(dom))) goto cleanup; =20 + cfg =3D virCHDriverGetConfig(driver); + if (virDomainUndefineFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 @@ -413,6 +422,10 @@ chDomainUndefineFlags(virDomainPtr dom, "%s", _("Cannot undefine transient domain")); goto cleanup; } + + if (virDomainDeleteConfig(cfg->configDir, NULL, vm) < 0) + goto cleanup; + event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_R= EMOVED); @@ -1413,6 +1426,7 @@ chStateInitialize(bool privileged, { int ret =3D VIR_DRV_STATE_INIT_ERROR; int rv; + virCHDriverConfig *cfg; =20 if (root !=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1444,7 +1458,7 @@ chStateInitialize(bool privileged, if (!(ch_driver->xmlopt =3D chDomainXMLConfInit(ch_driver))) goto cleanup; =20 - if (!(ch_driver->config =3D virCHDriverConfigNew(privileged))) + if (!(ch_driver->config =3D cfg =3D virCHDriverConfigNew(privileged))) goto cleanup; =20 if (!(ch_driver->hostdevMgr =3D virHostdevManagerGetDefault())) @@ -1459,6 +1473,14 @@ chStateInitialize(bool privileged, goto cleanup; } =20 + /* Persistent domains load */ + if (virDomainObjListLoadAllConfigs(ch_driver->domains, + cfg->configDir, + NULL, false, + ch_driver->xmlopt, + NULL, NULL) < 0) + goto cleanup; + ch_driver->chCaps =3D virCHCapsInitCHVersionCaps(ch_driver->version); =20 ch_driver->privileged =3D privileged; --=20 2.48.1