External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Don't use virDomainLiveConfigHelperMethod in virDomainObjSetMetadata

Browse Source
This commit is contained in:
Peter Krempa 2016-07-01 16:19:58 +02:00
parent 3bd161f862
commit bc472bc2df
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -24935,24 +24935,24 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
const char *configDir, const char *configDir,
unsigned int flags) unsigned int flags)
{ {
virDomainDefPtr def;
virDomainDefPtr persistentDef; virDomainDefPtr persistentDef;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1); VIR_DOMAIN_AFFECT_CONFIG, -1);
if (virDomainLiveConfigHelperMethod(caps, xmlopt, vm, &flags, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
&persistentDef) < 0)
return -1; return -1;
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
if (virDomainDefSetMetadata(vm->def, type, metadata, key, uri) < 0) if (virDomainDefSetMetadata(def, type, metadata, key, uri) < 0)
return -1; return -1;
if (virDomainSaveStatus(xmlopt, stateDir, vm, caps) < 0) if (virDomainSaveStatus(xmlopt, stateDir, vm, caps) < 0)
return -1; return -1;
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
if (virDomainDefSetMetadata(persistentDef, type, metadata, key, if (virDomainDefSetMetadata(persistentDef, type, metadata, key,
uri) < 0) uri) < 0)
return -1; return -1;