[libvirt] [PATCH 2/4] qemu: snapshot: Forbid partial internal snapshots

[Eric Blake]

On 05/20/2014 07:36 AM, Peter Krempa wrote:
> qemu's savevm command does a snapshot of all non readonly disks of a VM.
> Libvirt though allowed disabling snapshot for certain disk of a VM.
> ---
>  src/qemu/qemu_driver.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)

I think this may even be a regression introduced when we added
checkpoint snapshots, because I seem to recall trying to prevent just
this back when doing external disk snapshots.  But I didn't bother to
crawl git history to confirm or deny my suspicion.


> @@ -12699,12 +12703,13 @@ qemuDomainSnapshotPrepare(virConnectPtr conn,
>          }
>      }
> 
> -    /* internal snapshot requires a disk image to store the memory image to */
> -    if (def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL &&
> -        !found_internal) {
> +    /* internal snapshot requires a disk image to store the memory image to and

s/to and/to, and/

> +     * also disks can't be excluded from a internal snapshot*/

s/a internal/an internal/

> +    if ((def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL && !found_internal) ||
> +        (found_internal && forbid_internal)) {
>          virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                       _("internal checkpoints require at least "
> -                         "one disk to be selected for snapshot"));
> +                       _("internal snapshots and checkpoints require all "
> +                         "disks to be selected for snapshot"));
>          goto cleanup;
>      }
> 

ACK with the comment grammar fixes

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140520/eaf8fa9b/attachment-0001.sig>