forked from pool/libvirt
4d273a1174
- Update to libvirt 5.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
5cd9db3a-cputest-add-data-E3-1225-v5.patch,
538d8735-cpu_map-Define-md-clear-CPUID-bit.patch,
96f41cd7-admin-reject-clients.patch,
f111e094-locking-restrict-sockets-to-mode-0600.patch,
e37bd65f-logging-restrict-sockets-to-mode-0600.patch,
76b420d0-build-libqemutestdriver-lto-fix.patch
OBS-URL: https://build.opensuse.org/request/show/707328
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=762
33 lines
1.1 KiB
Diff
33 lines
1.1 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-5.4.0/src/qemu/qemu_driver.c
|
|
===================================================================
|
|
--- libvirt-5.4.0.orig/src/qemu/qemu_driver.c
|
|
+++ libvirt-5.4.0/src/qemu/qemu_driver.c
|
|
@@ -17719,6 +17719,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
|
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 (qemuDomainStorageFileInit(driver, vm, mirror, NULL) < 0)
|
|
goto endjob;
|
|
|