NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

metadata: track title edits across libvirtd restart

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1122205

Although the edits were changing in-memory XML, it was not flushed
to disk; so unless some other action changes XML, a libvirtd restart
would lose the changed information.

* src/conf/domain_conf.c (virDomainObjSetMetadata): Add parameter,
to save live status across restarts.
(virDomainSaveXML): Allow for test driver.
* src/conf/domain_conf.h (virDomainObjSetMetadata): Adjust
signature.
* src/bhyve/bhyve_driver.c (bhyveDomainSetMetadata): Adjust caller.
* src/lxc/lxc_driver.c (lxcDomainSetMetadata): Likewise.
* src/qemu/qemu_driver.c (qemuDomainSetMetadata): Likewise.
* src/test/test_driver.c (testDomainSetMetadata): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-07-22 09:41:05 -06:00
parent b6938a7c88
commit 60e4944059
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bhyve/bhyve_driver.c
View File

@ -1046,7 +1046,8 @@ bhyveDomainSetMetadata(virDomainPtr dom,
goto cleanup; goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps, ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
privconn->xmlopt, BHYVE_CONFIG_DIR, flags); privconn->xmlopt, BHYVE_STATE_DIR,
BHYVE_CONFIG_DIR, flags);
cleanup: cleanup:
virObjectUnref(caps); virObjectUnref(caps);

13
src/conf/domain_conf.c
View File

@ -18140,6 +18140,9 @@ virDomainSaveXML(const char *configDir,
char *configFile = NULL; char *configFile = NULL;
int ret = -1; int ret = -1;
if (!configDir)
return 0;
if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL)
goto cleanup; goto cleanup;
@ -19770,6 +19773,7 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
const char *uri, const char *uri,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
const char *stateDir,
const char *configDir, const char *configDir,
unsigned int flags) unsigned int flags)
{ {
@ -19782,12 +19786,17 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
&persistentDef) < 0) &persistentDef) < 0)
return -1; return -1;
if (flags & VIR_DOMAIN_AFFECT_LIVE) if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if (virDomainDefSetMetadata(vm->def, type, metadata, key, uri) < 0) if (virDomainDefSetMetadata(vm->def, type, metadata, key, uri) < 0)
return -1; return -1;
if (virDomainSaveStatus(xmlopt, stateDir, vm) < 0)
return -1;
}
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (virDomainDefSetMetadata(persistentDef, type, metadata, key, uri) < 0) if (virDomainDefSetMetadata(persistentDef, type, metadata, key,
uri) < 0)
return -1; return -1;
if (virDomainSaveConfig(configDir, persistentDef) < 0) if (virDomainSaveConfig(configDir, persistentDef) < 0)

1
src/conf/domain_conf.h
View File

@ -2664,6 +2664,7 @@ int virDomainObjSetMetadata(virDomainObjPtr vm,
const char *uri, const char *uri,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
const char *stateDir,
const char *configDir, const char *configDir,
unsigned int flags); unsigned int flags);

3
src/lxc/lxc_driver.c
View File

@ -5600,7 +5600,8 @@ lxcDomainSetMetadata(virDomainPtr dom,
goto cleanup; goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps, ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
driver->xmlopt, cfg->configDir, flags); driver->xmlopt, cfg->stateDir,
cfg->configDir, flags);
cleanup: cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);

3
src/qemu/qemu_driver.c
View File

@ -16118,7 +16118,8 @@ qemuDomainSetMetadata(virDomainPtr dom,
goto cleanup; goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps, ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, caps,
driver->xmlopt, cfg->configDir, flags); driver->xmlopt, cfg->stateDir,
cfg->configDir, flags);
cleanup: cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);

2
src/test/test_driver.c
View File

@ -3042,7 +3042,7 @@ static int testDomainSetMetadata(virDomainPtr dom,
ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri, ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri,
privconn->caps, privconn->xmlopt, privconn->caps, privconn->xmlopt,
NULL, flags); NULL, NULL, flags);
cleanup: cleanup:
if (privdom) if (privdom)