qemuDomainGetMetadata: Add top-level flag validation

The implementation uses 'virDomainObjGetMetadata'
internally. To have a top level flag validation for the upcoming flag
introspection export the supported flags as a macro and add a
'virCheckFlags'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3497e84bf590bcd24aa1c0feafed6fd9c3477837..d73bac5cc5ad9c120b0cabfad9510832d330a84b 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -31557,8 +31557,7 @@ virDomainObjGetMetadata(virDomainObj *vm,
     virDomainDef *def;
     char *ret = NULL;
 
-    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
-                  VIR_DOMAIN_AFFECT_CONFIG, NULL);
+    virCheckFlags(VIR_DOMAIN_OBJ_GET_METADATA_FLAGS, NULL);
 
     if (type >= VIR_DOMAIN_METADATA_LAST) {
         virReportError(VIR_ERR_INVALID_ARG,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a8f90803da6be86676ad365a570e06e74073b40a..bdfb99ed1d7023b91c0236580f2dfaf79012dacf 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4543,6 +4543,10 @@ const char *virDomainChrSourceDefGetPath(virDomainChrSourceDef *chr);
 
 void virDomainChrSourceDefClear(virDomainChrSourceDef *def);
 
+#define VIR_DOMAIN_OBJ_GET_METADATA_FLAGS \
+    VIR_DOMAIN_AFFECT_LIVE | \
+    VIR_DOMAIN_AFFECT_CONFIG
+
 char *virDomainObjGetMetadata(virDomainObj *vm,
                               int type,
                               const char *uri,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2b061c56e55c92a6697a8b9d1fe360ac2bcd672a..794493525a41b2f22d32c003befb126a1eb14c3f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16004,6 +16004,8 @@ qemuDomainGetMetadata(virDomainPtr dom,
     virDomainObj *vm;
     char *ret = NULL;
 
+    virCheckFlags(VIR_DOMAIN_OBJ_GET_METADATA_FLAGS, NULL);
+
     if (!(vm = qemuDomainObjFromDomain(dom)))
         return NULL;