External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: snapshots: Simplify REDEFINE flag check

Browse Source 
Makes things more readable IMO
This commit is contained in:
Cole Robinson 2013-08-21 16:10:37 -04:00
parent 9881bfed25
commit 56ff156d15
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_driver.c
View File

@ -12275,6 +12275,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
virDomainSnapshotDefPtr def = NULL; virDomainSnapshotDefPtr def = NULL;
bool update_current = true; bool update_current = true;
bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE;
unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS;
virDomainSnapshotObjPtr other = NULL; virDomainSnapshotObjPtr other = NULL;
int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
@ -12299,11 +12300,10 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
return NULL; return NULL;
} }
if (((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) ||
!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) ||
(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA))
update_current = false; update_current = false;
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) if (redefine)
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE;
virUUIDFormat(domain->uuid, uuidstr); virUUIDFormat(domain->uuid, uuidstr);
@ -12368,14 +12368,14 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_LIVE && if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_LIVE &&
(!virDomainObjIsActive(vm) || (!virDomainObjIsActive(vm) ||
def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL || def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL ||
flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { redefine)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("live snapshot creation is supported only " _("live snapshot creation is supported only "
"with external checkpoints")); "with external checkpoints"));
goto cleanup; goto cleanup;
} }
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) { if (redefine) {
/* Prevent circular chains */ /* Prevent circular chains */
if (def->parent) { if (def->parent) {
if (STREQ(def->name, def->parent)) { if (STREQ(def->name, def->parent)) {
@ -12546,7 +12546,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (update_current) if (update_current)
snap->def->current = true; snap->def->current = true;
if (vm->current_snapshot) { if (vm->current_snapshot) {
if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && if (!redefine &&
VIR_STRDUP(snap->def->parent, vm->current_snapshot->def->name) < 0) VIR_STRDUP(snap->def->parent, vm->current_snapshot->def->name) < 0)
goto cleanup; goto cleanup;
if (update_current) { if (update_current) {
@ -12559,7 +12559,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
} }
/* actually do the snapshot */ /* actually do the snapshot */
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) { if (redefine) {
/* XXX Should we validate that the redefined snapshot even /* XXX Should we validate that the redefined snapshot even
* makes sense, such as checking that qemu-img recognizes the * makes sense, such as checking that qemu-img recognizes the
* snapshot name in at least one of the domain's disks? */ * snapshot name in at least one of the domain's disks? */