From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 1 Jul 2016 14:19:58 +0000 (+0200)
Subject: conf: Don't use virDomainLiveConfigHelperMethod in virDomainObjSetMetadata
X-Git-Tag: v2.1.0-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc472bc2df8ad5be04b02a70062591218b553c82;p=thirdparty%2Flibvirt.git

conf: Don't use virDomainLiveConfigHelperMethod in virDomainObjSetMetadata
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9f7b90688a..da5a42b23f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -24935,24 +24935,24 @@ virDomainObjSetMetadata(virDomainObjPtr vm,
                         const char *configDir,
                         unsigned int flags)
 {
+    virDomainDefPtr def;
     virDomainDefPtr persistentDef;
 
     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG, -1);
 
-    if (virDomainLiveConfigHelperMethod(caps, xmlopt, vm, &flags,
-                                        &persistentDef) < 0)
+    if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
         return -1;
 
-    if (flags & VIR_DOMAIN_AFFECT_LIVE) {
-        if (virDomainDefSetMetadata(vm->def, type, metadata, key, uri) < 0)
+    if (def) {
+        if (virDomainDefSetMetadata(def, type, metadata, key, uri) < 0)
             return -1;
 
         if (virDomainSaveStatus(xmlopt, stateDir, vm, caps) < 0)
             return -1;
     }
 
-    if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
+    if (persistentDef) {
         if (virDomainDefSetMetadata(persistentDef, type, metadata, key,
                                     uri) < 0)
             return -1;