From b77d3d9b810d77070073bce73e5a19c1110e46e0 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 16 Jun 2014 14:05:07 +0200 Subject: [PATCH] qemu: snapshot: Don't mark all block disks for metadata reuse For block devices used as snapshot source the new snapshot code would set the reuse flag. This inhibits to take snapshot without specially preparing the block image before taking the snapshot. Fortunately this is not a regression as only the new way of specifying snapshot source is affected. For the followin snapshot XML: You'd get: error: internal error: unable to execute QEMU command 'transaction': Image is not in qcow2 format After this patch the snapshot is created successfully. --- src/qemu/qemu_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bf2020723..7ac7aa2d72 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12885,13 +12885,11 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, switch ((virStorageType)snap->src->type) { case VIR_STORAGE_TYPE_BLOCK: - reuse = true; - /* fallthrough */ case VIR_STORAGE_TYPE_FILE: /* create the stub file and set selinux labels; manipulate disk in * place, in a way that can be reverted on failure. */ - if (!reuse) { + if (!reuse && snap->src->type != VIR_STORAGE_TYPE_BLOCK) { fd = qemuOpenFile(driver, vm, source, O_WRONLY | O_TRUNC | O_CREAT, &need_unlink, NULL); if (fd < 0)