shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-30 18:50:18 +03:00
Code Releases Activity

conf: implement support for autostart once feature

Browse Source 
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'.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-12-20 11:26:55 +00:00
parent 65345dbf47
commit c6018e5f87
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/domain_conf.c
View File

@ -4170,6 +4170,7 @@ static void virDomainObjDispose(void *obj)
virDomainCheckpointObjListFree(dom->checkpoints);
virDomainJobObjFree(dom->job);
virObjectUnref(dom->closecallbacks);
g_free(dom->autostartOnceLink);
}
virDomainObj *
@ -29159,13 +29160,17 @@ virDomainDeleteConfig(const char *configDir,
{
g_autofree char *configFile = NULL;
g_autofree char *autostartLink = NULL;
g_autofree char *autostartOnceLink = NULL;
configFile = virDomainConfigFile(configDir, dom->def->name);
autostartLink = virDomainConfigFile(autostartDir, dom->def->name);
autostartOnceLink = g_strdup_printf("%s.once", autostartLink);
/* Not fatal if this doesn't work */
/* Not fatal if these don't work */
unlink(autostartLink);
unlink(autostartOnceLink);
dom->autostart = 0;
dom->autostartOnce = 0;
if (unlink(configFile) < 0 &&
errno != ENOENT) {

2
src/conf/domain_conf.h
View File

@ -3328,9 +3328,11 @@ struct _virDomainObj {
virDomainStateReason state;
unsigned int autostart : 1;
unsigned int autostartOnce : 1;
unsigned int persistent : 1;
unsigned int updated : 1;
unsigned int removing : 1;
char *autostartOnceLink;
virDomainDef *def; /* The current definition */
virDomainDef *newDef; /* New definition to activate at shutdown */

8
src/conf/virdomainobjlist.c
View File

@ -487,9 +487,11 @@ virDomainObjListLoadConfig(virDomainObjList *doms,
{
g_autofree char *configFile = NULL;
g_autofree char *autostartLink = NULL;
g_autofree char *autostartOnceLink = NULL;
g_autoptr(virDomainDef) def = NULL;
virDomainObj *dom;
int autostart;
int autostartOnce;
g_autoptr(virDomainDef) oldDef = NULL;
configFile = virDomainConfigFile(configDir, name);
@ -500,13 +502,19 @@ virDomainObjListLoadConfig(virDomainObjList *doms,
return NULL;
autostartLink = virDomainConfigFile(autostartDir, name);
autostartOnceLink = g_strdup_printf("%s.once", autostartLink);
autostart = virFileLinkPointsTo(autostartLink, configFile);
autostartOnce = virFileLinkPointsTo(autostartOnceLink, configFile);
if (!(dom = virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef)))
return NULL;
dom->autostart = autostart;
dom->autostartOnce = autostartOnce;
if (autostartOnce)
dom->autostartOnceLink = g_steal_pointer(&autostartOnceLink);
if (notify)
(*notify)(dom, oldDef == NULL, opaque);

14
src/hypervisor/domain_driver.c
View File

@ -683,10 +683,12 @@ virDomainDriverAutoStartOne(virDomainObj *vm,
virObjectLock(vm);
virObjectRef(vm);
VIR_DEBUG("Autostart %s: autostart=%d",
vm->def->name, vm->autostart);
VIR_DEBUG("Autostart %s: autostart=%d autostartOnce=%d autostartOnceLink=%s",
vm->def->name, vm->autostart, vm->autostartOnce,
NULLSTR(vm->autostartOnceLink));
if (vm->autostart && !virDomainObjIsActive(vm)) {
if ((vm->autostart || vm->autostartOnce) &&
!virDomainObjIsActive(vm)) {
virResetLastError();
if (state->cfg->delayMS) {
if (!state->first) {
@ -697,6 +699,12 @@ virDomainDriverAutoStartOne(virDomainObj *vm,
}
state->cfg->callback(vm, state->cfg->opaque);
vm->autostartOnce = 0;
}
if (vm->autostartOnceLink) {
unlink(vm->autostartOnceLink);
g_clear_pointer(&vm->autostartOnceLink, g_free);
}
virDomainObjEndAPI(&vm);