From: Peter Krempa <[email protected]> Move the flag check to the top level to allow programatic introspection of supported flags.
Signed-off-by: Peter Krempa <[email protected]> --- src/qemu/qemu_backup.c | 8 +------- src/qemu/qemu_backup.h | 3 +-- src/qemu/qemu_driver.c | 7 ++++++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 65a083ea74..a0544c83dc 100644 --- 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 c259883bca..602a1e6a99 100644 --- 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 558c22982d..8027b5775e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13627,6 +13627,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; @@ -13648,13 +13651,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); -- 2.54.0
