qemu: backup: Move 'virCheckFlags' to top level functions

Move the flag check to the top level to allow programatic introspection
of supported flags.

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

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 65a083ea74298bd89ada00038feba1dffab28a37..a0544c83dc8e8ca97c6922c804a2926d0a192f87 100644 (file)
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -808,9 +808,6 @@ qemuBackupBegin(virDomainObj *vm,
     int ret = -1;
     g_autoptr(qemuFDPassDirect) fdpass = NULL;
 
-    virCheckFlags(VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL |
-                  VIR_DOMAIN_BACKUP_BEGIN_PRESERVE_SHUTDOWN_DOMAIN, -1);
-
     if (!(def = virDomainBackupDefParseString(backupXML, priv->driver->xmlopt, 0)))
         return -1;
 
@@ -986,16 +983,13 @@ qemuBackupBegin(virDomainObj *vm,
 
 
 char *
-qemuBackupGetXMLDesc(virDomainObj *vm,
-                     unsigned int flags)
+qemuBackupGetXMLDesc(virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
 
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virDomainBackupDef *backup;
 
-    virCheckFlags(0, NULL);
-
     if (!(backup = qemuDomainGetBackup(vm)))
         return NULL;
 

diff --git a/src/qemu/qemu_backup.h b/src/qemu/qemu_backup.h
index c259883bca30769e4030327db7312f548382fd74..602a1e6a9981a7d2704b11a8d64491fa4d5560b6 100644 (file)
--- a/src/qemu/qemu_backup.h
+++ b/src/qemu/qemu_backup.h
@@ -25,8 +25,7 @@ qemuBackupBegin(virDomainObj *vm,
                 unsigned int flags);
 
 char *
-qemuBackupGetXMLDesc(virDomainObj *vm,
-                     unsigned int flags);
+qemuBackupGetXMLDesc(virDomainObj *vm);
 
 void
 qemuBackupJobCancelBlockjobs(virDomainObj *vm,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c8ef12ed1aff3c50215ce8130501eb0fb9adc3e0..f29211e4224a833a78acd4f735151a3b47db5982 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13633,6 +13633,9 @@ qemuDomainBackupBegin(virDomainPtr domain,
     virDomainObj *vm = NULL;
     int ret = -1;
 
+    virCheckFlags(VIR_DOMAIN_BACKUP_BEGIN_REUSE_EXTERNAL |
+                  VIR_DOMAIN_BACKUP_BEGIN_PRESERVE_SHUTDOWN_DOMAIN, -1);
+
     if (!(vm = qemuDomainObjFromDomain(domain)))
         goto cleanup;
 
@@ -13654,13 +13657,15 @@ qemuDomainBackupGetXMLDesc(virDomainPtr domain,
     virDomainObj *vm = NULL;
     char *ret = NULL;
 
+    virCheckFlags(0, NULL);
+
     if (!(vm = qemuDomainObjFromDomain(domain)))
         return NULL;
 
     if (virDomainBackupGetXMLDescEnsureACL(domain->conn, vm->def) < 0)
         goto cleanup;
 
-    ret = qemuBackupGetXMLDesc(vm, flags);
+    ret = qemuBackupGetXMLDesc(vm);
 
  cleanup:
     virDomainObjEndAPI(&vm);