[libvirt] [PATCH v2 6/9] qemu: snapshots: Simplify REDEFINE flag check
Makes things more readable IMO
---
src/qemu/qemu_driver.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ed29373..e7212c1 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12283,6 +12283,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
char uuidstr[VIR_UUID_STRING_BUFLEN];
virDomainSnapshotDefPtr def = NULL;
bool update_current = true;
+ bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE;
unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS;
virDomainSnapshotObjPtr other = NULL;
int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
@@ -12307,11 +12308,10 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
return NULL;
}
- if (((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) &&
- !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) ||
+ if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) ||
(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA))
update_current = false;
- if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)
+ if (redefine)
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE;
virUUIDFormat(domain->uuid, uuidstr);
@@ -12376,14 +12376,14 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_LIVE &&
(!virDomainObjIsActive(vm) ||
def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL ||
- flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) {
+ redefine)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("live snapshot creation is supported only "
"with external checkpoints"));
goto cleanup;
}
- if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) {
+ if (redefine) {
/* Prevent circular chains */
if (def->parent) {
if (STREQ(def->name, def->parent)) {
@@ -12554,7 +12554,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (update_current)
snap->def->current = true;
if (vm->current_snapshot) {
- if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) &&
+ if (!redefine &&
VIR_STRDUP(snap->def->parent, vm->current_snapshot->def->name)
< 0)
goto cleanup;
if (update_current) {
@@ -12567,7 +12567,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
}
/* actually do the snapshot */
- if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) {
+ if (redefine) {
/* XXX Should we validate that the redefined snapshot even
* makes sense, such as checking that qemu-img recognizes the
* snapshot name in at least one of the domain's disks? */
--
1.8.3.1