SHA256
1
0
forked from pool/libvirt
libvirt/blockcopy-check-dst-identical-device.patch
James Fehlig 9c26a2274f Accepting request 328678 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.2.19
  - Improved ppc64 support
  - New virDomainRename API
  - Support for new QEMU pci emulations
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped upstream patches:
    269d39af-storage-allocation-fix.patch,
    26c5fa3a-virt-aa-helper-missing-doc.patch,
    d25a5e08-virt-aa-helper-simplify-restriction-logic.patch,
    2f01cfdf-virt-aa-helper-allow-ovmf.patch,
    91fdcefa-virt-aa-helper-allow-nvram.patch,
    52970dec-virt-aa-helper-improve-valid-path.patch,
    44a54eb0-libxl-fix-refcnt-MigrationDstArgs.patch,
    15120b8c-libxl-no-resume-on-suspend-fail.patch,
    e80b84a7-libxl-acquire-job-on-migrate.patch,
    60acb38-revert-curmem-inactive-dom.patch

OBS-URL: https://build.opensuse.org/request/show/328678
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=481
2015-09-02 15:27:32 +00:00

34 lines
1.2 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-1.2.19/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.2.19.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.19/src/qemu/qemu_driver.c
@@ -16725,6 +16725,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet"));
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 (stat(mirror->path, &st) < 0) {
if (errno != ENOENT) {
virReportSystemError(errno, _("unable to stat for disk %s: %s"),