forked from pool/libvirt
c7b51f773c
- Update to libvirt 1.3.5 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: e4d131b8-mv-virDomainDefPostParseInternal.patch, 3e428670-post-parse-implicit-video.patch, 538012c8-default-vram.patch, 96b21fb0-vram-tests.patch, 400e716d-libxl-noprope-emulator.patch, b90c4b5f-tests-use-qemu-xen.patch, fccf2725-libxl-API-4.4.patch, 5325123d-libxl-migv2-save-restore.patch, f9edcfa4-libxl-migv2-migration.patch, a1c9a81a-libxl-rbd-fix.patch, ba566428-libxl-dom-iface-addrs.patch - spec: simplify and cleanup by removing many conditionals that are never toogled. Also drop conditionals for suse_version < 1310 OBS-URL: https://build.opensuse.org/request/show/400351 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 475b272c126d53f3985860422dc96b01b470423e Mon Sep 17 00:00:00 2001
|
|
From: Chunyan Liu <cyliu@suse.com>
|
|
Date: Tue, 29 Jul 2014 17:31:28 +0800
|
|
Subject: [PATCH] blockcopy: check dst = identical device
|
|
|
|
Check whether dst is the same device as source, if yes, report
|
|
error and exit.
|
|
|
|
Signed-off-by: Chunyan Liu <cyliu@suse.com>
|
|
---
|
|
src/qemu/qemu_driver.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
Index: libvirt-1.3.5/src/qemu/qemu_driver.c
|
|
===================================================================
|
|
--- libvirt-1.3.5.orig/src/qemu/qemu_driver.c
|
|
+++ libvirt-1.3.5/src/qemu/qemu_driver.c
|
|
@@ -16432,6 +16432,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
|
_("non-file destination not supported yet"));
|
|
goto endjob;
|
|
}
|
|
+
|
|
+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL),
|
|
+ realpath(mirror->path, NULL))) {
|
|
+ virReportError(VIR_ERR_INVALID_ARG,
|
|
+ _("destination '%s' is the same as disk '%s' source"),
|
|
+ mirror->path, path);
|
|
+ goto endjob;
|
|
+ }
|
|
+
|
|
if (stat(mirror->path, &st) < 0) {
|
|
if (errno != ENOENT) {
|
|
virReportSystemError(errno, _("unable to stat for disk %s: %s"),
|