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_checkpoint.c | 11 ----------- src/qemu/qemu_driver.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 193cf9a06a..f063b5a5c0 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -582,9 +582,6 @@ qemuCheckpointCreateXML(virDomainPtr domain, g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virDomainCheckpointDef) def = NULL; - virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | - VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, NULL); - if (redefine) { parse_flags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; update_current = false; @@ -783,10 +780,6 @@ qemuCheckpointGetXMLDesc(virDomainObj *vm, virDomainCheckpointDef *chkdef; unsigned int format_flags; - virCheckFlags(VIR_DOMAIN_CHECKPOINT_XML_SECURE | - VIR_DOMAIN_CHECKPOINT_XML_NO_DOMAIN | - VIR_DOMAIN_CHECKPOINT_XML_SIZE, NULL); - if (!(chk = qemuCheckpointObjFromCheckpoint(vm, checkpoint))) return NULL; @@ -847,10 +840,6 @@ qemuCheckpointDelete(virDomainObj *vm, struct virQEMUCheckpointReparent rep; bool metadata_only = !!(flags & VIR_DOMAIN_CHECKPOINT_DELETE_METADATA_ONLY); - virCheckFlags(VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN | - VIR_DOMAIN_CHECKPOINT_DELETE_METADATA_ONLY | - VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN_ONLY, -1); - if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 431b3b741e..b0b5c12d47 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13448,6 +13448,9 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain, virDomainObj *vm = NULL; virDomainCheckpointPtr checkpoint = NULL; + virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | + VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE_VALIDATE, NULL); + if (!(vm = qemuDomainObjFromDomain(domain))) goto cleanup; @@ -13589,6 +13592,10 @@ qemuDomainCheckpointGetXMLDesc(virDomainCheckpointPtr checkpoint, virDomainObj *vm = NULL; char *xml = NULL; + virCheckFlags(VIR_DOMAIN_CHECKPOINT_XML_SECURE | + VIR_DOMAIN_CHECKPOINT_XML_NO_DOMAIN | + VIR_DOMAIN_CHECKPOINT_XML_SIZE, NULL); + if (!(vm = qemuDomObjFromCheckpoint(checkpoint))) return NULL; @@ -13610,6 +13617,10 @@ qemuDomainCheckpointDelete(virDomainCheckpointPtr checkpoint, virDomainObj *vm = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN | + VIR_DOMAIN_CHECKPOINT_DELETE_METADATA_ONLY | + VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN_ONLY, -1); + if (!(vm = qemuDomObjFromCheckpoint(checkpoint))) return -1; -- 2.54.0
