[libvirt] [PATCHv4 29/29] qemu: snapshot: Use storage driver to pre-create snapshot file

[Peter Krempa]

On 06/30/14 17:20, Peter Krempa wrote:
> Move the last operation done on local files to the storage driver API.
> ---
>  src/qemu/qemu_driver.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 281c648..79970f2 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c

I forgot to amend the following hunk to this patch before sending:

@@ -12829,7 +12829,6 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     char *source = NULL;
     const char *formatStr = NULL;
     int ret = -1;
-    int fd = -1;
     bool need_unlink = false;

     if (snap->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) {

> @@ -12847,7 +12847,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
>      if (virStorageSourceInitChainElement(newDiskSrc, disk->src, false) < 0)
>          goto cleanup;
> 
> -    if (virStorageFileInit(newDiskSrc) < 0)
> +    if (qemuDomainStorageFileInit(driver, vm, newDiskSrc) < 0)
>          goto cleanup;
> 
>      if (qemuGetDriveSourceString(newDiskSrc, NULL, &source) < 0)
> @@ -12863,15 +12863,13 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
>      }
> 
>      /* pre-create the image file so that we can label it before handing it to qemu */
> -    /* XXX we should switch to storage driver based pre-creation of the image */
> -    if (virStorageSourceIsLocalStorage(newDiskSrc)) {
> -        if (!reuse && newDiskSrc->type != VIR_STORAGE_TYPE_BLOCK) {
> -            fd = qemuOpenFile(driver, vm, source, O_WRONLY | O_TRUNC | O_CREAT,
> -                              &need_unlink, NULL);
> -            if (fd < 0)
> -                goto cleanup;
> -            VIR_FORCE_CLOSE(fd);
> +    if (!reuse && newDiskSrc->type != VIR_STORAGE_TYPE_BLOCK) {
> +        if (virStorageFileCreate(newDiskSrc) < 0) {
> +            virReportSystemError(errno, _("failed to create image file '%s'"),
> +                                 source);
> +            goto cleanup;
>          }
> +        need_unlink = true;
>      }
> 
>      /* set correct security, cgroup and locking options on the new image */
> 

Peter

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