forked from pool/libvirt
0d01ad3986
- Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
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-3.6.0/src/qemu/qemu_driver.c
|
|
===================================================================
|
|
--- libvirt-3.6.0.orig/src/qemu/qemu_driver.c
|
|
+++ libvirt-3.6.0/src/qemu/qemu_driver.c
|
|
@@ -16836,6 +16836,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) < 0)
|
|
goto endjob;
|
|
|