From nobody Mon Dec 15 09:42:40 2025 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741800283330149.06742866557659; Wed, 12 Mar 2025 10:24:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9C12B1186; Wed, 12 Mar 2025 13:24:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BF1E31EE4; Wed, 12 Mar 2025 13:19:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 45B531C8F; Wed, 12 Mar 2025 13:19:23 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 EDAFC1CED for ; Wed, 12 Mar 2025 13:18:56 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-168-spjFdpFqMt-GctLxEWLCZA-1; Wed, 12 Mar 2025 13:18:23 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A4C7195605A for ; Wed, 12 Mar 2025 17:18:22 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.57]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F9071800945; Wed, 12 Mar 2025 17:18:20 +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, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,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=1741799936; 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=ZHGHFVIh0JVu0AMyEOShoA4Tg4IZINSfd28AeE12ITw=; b=NgTdRiM0zqI97401wVB6PJ22JkNbH9KY3LMcf/tSQs1kNklnH/aKxIDu+9iNJqoCR1BvKe yF9+bKiyekKjO4N/Wuma8Pt5vUQ9i6Lo1nfesui2/+iVuXPanV//15+4cf399XiDoGKNKm +woDBy/wDCls5HfabI6cs8HwxPjRZEk= X-MC-Unique: spjFdpFqMt-GctLxEWLCZA-1 X-Mimecast-MFC-AGG-ID: spjFdpFqMt-GctLxEWLCZA_1741799902 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 11/22] conf: implement support for autostart once feature Date: Wed, 12 Mar 2025 17:17:51 +0000 Message-ID: <20250312171802.1854985-12-berrange@redhat.com> In-Reply-To: <20250312171802.1854985-1-berrange@redhat.com> References: <20250312171802.1854985-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: V2ltfGDQ8gYWbP_qn38JmSUVx_29keGXFyLOiZwFzUY_1741799902 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PQWS4Z7ZQLLEDG2VW3NZWAYQBTX2FKL3 X-Message-ID-Hash: PQWS4Z7ZQLLEDG2VW3NZWAYQBTX2FKL3 X-MailFrom: berrange@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 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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741800285072019000 Content-Type: text/plain; charset="utf-8" This is maintained in the same way as the autostart flag, using a symlink. The difference is that instead of '.xml', the symlink suffix is '.xml.once'. The link is also deleted immediately after it has been read. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- src/conf/domain_conf.c | 7 ++++++- src/conf/domain_conf.h | 2 ++ src/conf/virdomainobjlist.c | 8 ++++++++ src/hypervisor/domain_driver.c | 14 +++++++++++--- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b94cf99236..cf8374ab18 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4166,6 +4166,7 @@ static void virDomainObjDispose(void *obj) virDomainCheckpointObjListFree(dom->checkpoints); virDomainJobObjFree(dom->job); virObjectUnref(dom->closecallbacks); + g_free(dom->autostartOnceLink); } =20 virDomainObj * @@ -29135,13 +29136,17 @@ virDomainDeleteConfig(const char *configDir, { g_autofree char *configFile =3D NULL; g_autofree char *autostartLink =3D NULL; + g_autofree char *autostartOnceLink =3D NULL; =20 configFile =3D virDomainConfigFile(configDir, dom->def->name); autostartLink =3D virDomainConfigFile(autostartDir, dom->def->name); + autostartOnceLink =3D g_strdup_printf("%s.once", autostartLink); =20 - /* Not fatal if this doesn't work */ + /* Not fatal if these don't work */ unlink(autostartLink); + unlink(autostartOnceLink); dom->autostart =3D 0; + dom->autostartOnce =3D 0; =20 if (unlink(configFile) < 0 && errno !=3D ENOENT) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3a97fd866c..c648864083 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3324,9 +3324,11 @@ struct _virDomainObj { virDomainStateReason state; =20 unsigned int autostart : 1; + unsigned int autostartOnce : 1; unsigned int persistent : 1; unsigned int updated : 1; unsigned int removing : 1; + char *autostartOnceLink; =20 virDomainDef *def; /* The current definition */ virDomainDef *newDef; /* New definition to activate at shutdown */ diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 72207450c5..90efb3465c 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -487,9 +487,11 @@ virDomainObjListLoadConfig(virDomainObjList *doms, { g_autofree char *configFile =3D NULL; g_autofree char *autostartLink =3D NULL; + g_autofree char *autostartOnceLink =3D NULL; g_autoptr(virDomainDef) def =3D NULL; virDomainObj *dom; int autostart; + int autostartOnce; g_autoptr(virDomainDef) oldDef =3D NULL; =20 configFile =3D virDomainConfigFile(configDir, name); @@ -500,13 +502,19 @@ virDomainObjListLoadConfig(virDomainObjList *doms, return NULL; =20 autostartLink =3D virDomainConfigFile(autostartDir, name); + autostartOnceLink =3D g_strdup_printf("%s.once", autostartLink); =20 autostart =3D virFileLinkPointsTo(autostartLink, configFile); + autostartOnce =3D virFileLinkPointsTo(autostartOnceLink, configFile); =20 if (!(dom =3D virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef= ))) return NULL; =20 dom->autostart =3D autostart; + dom->autostartOnce =3D autostartOnce; + + if (autostartOnce) + dom->autostartOnceLink =3D g_steal_pointer(&autostartOnceLink); =20 if (notify) (*notify)(dom, oldDef =3D=3D NULL, opaque); diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index d4cf09174b..bfba435ee0 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -682,10 +682,12 @@ virDomainDriverAutoStartOne(virDomainObj *vm, virObjectLock(vm); virObjectRef(vm); =20 - VIR_DEBUG("Autostart %s: autostart=3D%d", - vm->def->name, vm->autostart); + VIR_DEBUG("Autostart %s: autostart=3D%d autostartOnce=3D%d autostartOn= ceLink=3D%s", + vm->def->name, vm->autostart, vm->autostartOnce, + NULLSTR(vm->autostartOnceLink)); =20 - if (vm->autostart && !virDomainObjIsActive(vm)) { + if ((vm->autostart || vm->autostartOnce) && + !virDomainObjIsActive(vm)) { virResetLastError(); if (state->cfg->delayMS) { if (!state->first) { @@ -696,6 +698,12 @@ virDomainDriverAutoStartOne(virDomainObj *vm, } =20 state->cfg->callback(vm, state->cfg->opaque); + vm->autostartOnce =3D 0; + } + + if (vm->autostartOnceLink) { + unlink(vm->autostartOnceLink); + g_clear_pointer(&vm->autostartOnceLink, g_free); } =20 virDomainObjEndAPI(&vm); --=20 2.48.1