SHA256
1
0
forked from pool/libvirt
libvirt/blockcopy-check-dst-identical-device.patch
James Fehlig c5e448dfb3 Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    72adaf2f-revert-qemu-monitor-error-report.patch,
    71d56a39-nodedev-fix-parse-PCI-address.patch,
    68eed56b-conf-smbios-oem-strings.patch,
    76977061-qemu-smbios-oem-strings.patch,
    0c710a37-libxl-resume-lock-on-mig-failure.patch,
    759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
    c2dc6698-fix-deadlock-obtaining-hostname.patch,
    c391e07e-libxl-clock-settings.patch,
    ef71caea-libxl-memalign.patch,
    suse-apparmor-signal.patch

OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 17:46:32 +00:00

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-4.1.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-4.1.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.1.0/src/qemu/qemu_driver.c
@@ -17275,6 +17275,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;