From: Guannan Ren <gren@redhat.com>
Date: Tue, 4 Jun 2013 08:42:55 +0000 (+0800)
Subject: snapshot: remove mutually exclusive memory and disk-only duplicate check
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ed91e32b08ae8aabaa26b45213288040dfd54c7e;p=libvirt.git

snapshot: remove mutually exclusive memory and disk-only duplicate check

The work was done at the time of snapshot xmlstring parsing

 if (offline && def->memory &&
     def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) {
     virReportError(...);
 }
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9d3f632726..db5682306e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11730,14 +11730,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
                          "with external checkpoints"));
         goto cleanup;
     }
-    if ((def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL ||
-         def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL) &&
-        flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("disk-only snapshot creation is not compatible with "
-                         "memory snapshot"));
-        goto cleanup;
-    }
 
     if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) {
         /* Prevent circular chains */