forked from pool/libvirt
de9b140cb2
- Update to libvirt 1.2.20
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped upstream patches:
3468542f-virFileUnlink.patch,
8b1d84e6-refreshVol-failure.patch,
e0025d29-storage-mode-check.patch,
ba25c214-libxl-log-level.patch,
56945e13-libxl-AttachDeviceConfig-hostdev.patch
OBS-URL: https://build.opensuse.org/request/show/335994
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=490
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.2.20/src/qemu/qemu_driver.c
|
|
===================================================================
|
|
--- libvirt-1.2.20.orig/src/qemu/qemu_driver.c
|
|
+++ libvirt-1.2.20/src/qemu/qemu_driver.c
|
|
@@ -16715,6 +16715,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"),
|