NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

snapshot: qemu: Remove restrictions preventing external checkpoints

Browse Source 
Some of the pre-snapshot check have restrictions wired in regarding
configuration options that influence taking of external checkpoints.

This patch removes restrictions that would inhibit taking of such a
snapshot.
This commit is contained in:
Peter Krempa 2012-10-08 19:28:08 +02:00
parent f569b87f51
commit 0dac29d89f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/qemu/qemu_driver.c
View File

@ -10792,14 +10792,6 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virDomainSnapshotDefPtr def,
break; break;
case VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL: case VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL:
if (def->state != VIR_DOMAIN_DISK_SNAPSHOT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("system checkpoint external snapshot for "
"disk %s not implemented yet"),
disk->name);
goto cleanup;
}
if (!disk->format) { if (!disk->format) {
disk->format = VIR_STORAGE_FILE_QCOW2; disk->format = VIR_STORAGE_FILE_QCOW2;
} else if (disk->format != VIR_STORAGE_FILE_QCOW2 && } else if (disk->format != VIR_STORAGE_FILE_QCOW2 &&
@ -10845,12 +10837,15 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virDomainSnapshotDefPtr def,
} }
} }
if (!found) { /* external snapshot is possible without specifying a disk to snapshot */
if (!found &&
def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("snapshots require at least one disk to be " _("internal and disk-only snapshots require at least "
"selected for snapshot")); "one disk to be selected for snapshot"));
goto cleanup; goto cleanup;
} }
if (def->state != VIR_DOMAIN_DISK_SNAPSHOT && active) { if (def->state != VIR_DOMAIN_DISK_SNAPSHOT && active) {
if (external == 1 || if (external == 1 ||
qemuCapsGet(priv->caps, QEMU_CAPS_TRANSACTION)) { qemuCapsGet(priv->caps, QEMU_CAPS_TRANSACTION)) {
@ -11436,7 +11431,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
snap = other; snap = other;
} }
if (def->dom) { if (def->dom) {
if (def->state == VIR_DOMAIN_DISK_SNAPSHOT) { if (def->state == VIR_DOMAIN_DISK_SNAPSHOT ||
def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
align_match = false; align_match = false;
} }
@ -11464,6 +11460,10 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
align_match = false; align_match = false;
def->state = VIR_DOMAIN_DISK_SNAPSHOT; def->state = VIR_DOMAIN_DISK_SNAPSHOT;
def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE;
} else if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {
def->state = virDomainObjGetState(vm, NULL);
align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL;
align_match = false;
} else { } else {
def->state = virDomainObjGetState(vm, NULL); def->state = virDomainObjGetState(vm, NULL);
def->memory = (def->state == VIR_DOMAIN_SHUTOFF ? def->memory = (def->state == VIR_DOMAIN_SHUTOFF ?