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 500763 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
aeda1b8c-qemu-no-error-shutdown.patch,
8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch,
2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch,
d12781b4-conf-iommu-cache-mode-attr.patch,
a5691448-qemu-iommu-cache-mode.patch,
3a276c65-conf-iommu-def-stability-check.patch,
935d927a-conf-iommu-ABI-stability-check.patch,
4cd3f241-fix-NULL-disk-source.patch,
975ea20f-loopback-macro.patch,
dbb85e0c-libxl-graphics-listen-addr.patch,
libxl-def-usbctrl.patch, revert-2841e675-mtu.patch
- FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213
OBS-URL: https://build.opensuse.org/request/show/500763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=606
2017-06-02 20:08:28 +02:00
|
|
|
Index: libvirt-3.4.0/src/qemu/qemu_driver.c
|
2014-08-08 17:04:43 +02:00
|
|
|
===================================================================
|
Accepting request 500763 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
aeda1b8c-qemu-no-error-shutdown.patch,
8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch,
2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch,
d12781b4-conf-iommu-cache-mode-attr.patch,
a5691448-qemu-iommu-cache-mode.patch,
3a276c65-conf-iommu-def-stability-check.patch,
935d927a-conf-iommu-ABI-stability-check.patch,
4cd3f241-fix-NULL-disk-source.patch,
975ea20f-loopback-macro.patch,
dbb85e0c-libxl-graphics-listen-addr.patch,
libxl-def-usbctrl.patch, revert-2841e675-mtu.patch
- FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213
OBS-URL: https://build.opensuse.org/request/show/500763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=606
2017-06-02 20:08:28 +02:00
|
|
|
--- libvirt-3.4.0.orig/src/qemu/qemu_driver.c
|
|
|
|
+++ libvirt-3.4.0/src/qemu/qemu_driver.c
|
|
|
|
@@ -16586,6 +16586,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
2014-10-02 00:29:37 +02:00
|
|
|
_("non-file destination not supported yet"));
|
2015-04-02 18:20:09 +02:00
|
|
|
goto endjob;
|
2014-08-08 17:04:43 +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;
|
|
|
|
+ }
|
|
|
|
+
|
2014-10-02 00:29:37 +02:00
|
|
|
if (stat(mirror->path, &st) < 0) {
|
2014-08-08 17:04:43 +02:00
|
|
|
if (errno != ENOENT) {
|
|
|
|
virReportSystemError(errno, _("unable to stat for disk %s: %s"),
|