96a1f2af34
- Update to libvirt 3.3.0 RC1 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: ae102b5d7-qemu-fix-regression-when-hyperv-vendor_id-feature-is-used.patch - Bug fixes: bsc#978121, bsc#1017017, bsc#1032863, bsc#1033117, bsc#1034024, bsc#1034146 - libxl: add default controllers for USB devices libxl-def-usbctrl.patch bsc#1031056 OBS-URL: https://build.opensuse.org/request/show/491883 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=599
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-3.3.0/src/qemu/qemu_driver.c
|
|
===================================================================
|
|
--- libvirt-3.3.0.orig/src/qemu/qemu_driver.c
|
|
+++ libvirt-3.3.0/src/qemu/qemu_driver.c
|
|
@@ -16566,6 +16566,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"),
|