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 567780 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.0.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
2d07f1f0-fix-storage-crash.patch,
69ed99c7-dom0-persistent.patch,
8599aedd-libvirt-guests-dom0-filter.patch,
0f33025a-virt-aa-helper-handle-more-disk-images.patch,
b475a91b-add-virStringFilterChars-string-utility.patch,
faec1958-lxc-set-hostname-based-on-container-name.patch,
2089ab21-netserver-close-clients-before-stopping-all-drivers.patch,
fix-virt-aa-helper-profile.patch,
suse-apparmor-signal.patch
- Patches added to fix upstream bugs:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch
- CVE-2018-5748, CVE-2017-5715, bsc#1071651
OBS-URL: https://build.opensuse.org/request/show/567780
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=661
2018-01-19 20:16:17 +01:00
|
|
|
Index: libvirt-4.0.0/src/qemu/qemu_driver.c
|
2014-08-08 17:04:43 +02:00
|
|
|
===================================================================
|
Accepting request 567780 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.0.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
2d07f1f0-fix-storage-crash.patch,
69ed99c7-dom0-persistent.patch,
8599aedd-libvirt-guests-dom0-filter.patch,
0f33025a-virt-aa-helper-handle-more-disk-images.patch,
b475a91b-add-virStringFilterChars-string-utility.patch,
faec1958-lxc-set-hostname-based-on-container-name.patch,
2089ab21-netserver-close-clients-before-stopping-all-drivers.patch,
fix-virt-aa-helper-profile.patch,
suse-apparmor-signal.patch
- Patches added to fix upstream bugs:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch
- CVE-2018-5748, CVE-2017-5715, bsc#1071651
OBS-URL: https://build.opensuse.org/request/show/567780
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=661
2018-01-19 20:16:17 +01:00
|
|
|
--- libvirt-4.0.0.orig/src/qemu/qemu_driver.c
|
|
|
|
+++ libvirt-4.0.0/src/qemu/qemu_driver.c
|
|
|
|
@@ -17159,6 +17159,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;
|
|
|
|
|