2014-08-08 17:04:43 +02:00
|
|
|
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(+)
|
|
|
|
|
Accepting request 681981 from home:jfehlig:branches:Virtualization
- Update to libvirt 5.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
11c8aca9-libxl-set-mem-after-balloon.patch,
70c2933d-apparmor-named-profiles.patch,
a3ab6d42-apparmor-conv-libvirtd-named-profile.patch,
b6440119-qemu-conf-sev.patch,
a404ac34-qemu-cgroup-sev.patch,
6fd4c8f8-qemu-domain-sev.patch,
17f6a257-security-dac-sev.patch,
a2d3dea9-qemu-caps-dac-override-sev.patch,
620d9dd5-qemu-no-dac-override-nonroot.patch
- jsc#SLE-3887, jsc#SLE-4480, jsc#SLE-4577
OBS-URL: https://build.opensuse.org/request/show/681981
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=734
2019-03-06 03:00:59 +01:00
|
|
|
Index: libvirt-5.1.0/src/qemu/qemu_driver.c
|
2014-08-08 17:04:43 +02:00
|
|
|
===================================================================
|
Accepting request 681981 from home:jfehlig:branches:Virtualization
- Update to libvirt 5.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
11c8aca9-libxl-set-mem-after-balloon.patch,
70c2933d-apparmor-named-profiles.patch,
a3ab6d42-apparmor-conv-libvirtd-named-profile.patch,
b6440119-qemu-conf-sev.patch,
a404ac34-qemu-cgroup-sev.patch,
6fd4c8f8-qemu-domain-sev.patch,
17f6a257-security-dac-sev.patch,
a2d3dea9-qemu-caps-dac-override-sev.patch,
620d9dd5-qemu-no-dac-override-nonroot.patch
- jsc#SLE-3887, jsc#SLE-4480, jsc#SLE-4577
OBS-URL: https://build.opensuse.org/request/show/681981
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=734
2019-03-06 03:00:59 +01:00
|
|
|
--- libvirt-5.1.0.orig/src/qemu/qemu_driver.c
|
|
|
|
+++ libvirt-5.1.0/src/qemu/qemu_driver.c
|
|
|
|
@@ -17836,6 +17836,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
2015-04-02 18:20:09 +02:00
|
|
|
goto endjob;
|
2014-08-08 17:04:43 +02:00
|
|
|
}
|
2017-08-03 19:28:59 +02:00
|
|
|
|
2014-10-02 00:29:37 +02:00
|
|
|
+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL),
|
|
|
|
+ realpath(mirror->path, NULL))) {
|
2014-08-08 17:04:43 +02:00
|
|
|
+ virReportError(VIR_ERR_INVALID_ARG,
|
|
|
|
+ _("destination '%s' is the same as disk '%s' source"),
|
2014-10-02 00:29:37 +02:00
|
|
|
+ mirror->path, path);
|
2014-08-08 17:04:43 +02:00
|
|
|
+ goto endjob;
|
|
|
|
+ }
|
|
|
|
+
|
2017-12-01 23:52:01 +01:00
|
|
|
if (qemuDomainStorageFileInit(driver, vm, mirror, NULL) < 0)
|
2017-08-03 19:28:59 +02:00
|
|
|
goto endjob;
|
|
|
|
|