SHA256
1
0
forked from pool/libvirt
libvirt/blockcopy-check-dst-identical-device.patch
James Fehlig 9462ef6485 Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
  09877303-virSocketAddrParseInternal.patch,
  412afdb8-intro-virSocketAddrParseAny.patch
  bsc#1080957

- Update to libvirt 4.2.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    6b3d716e-keycodemap-py3.patch,
    33c6eb96-fix-libvirtd-reload-deadlock.patch,
    464889ff-rpc-aquire-ref-dispatch.patch,
    c6f1d519-rpc-simplify-dispatch.patch,
    06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
    86cae503-rpc-fix-pre-exec.patch,
    eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
    fbf31e1a-CVE-2018-1064.patch,
    fb327ac2-virtlockd-admin-socket.patch,
    64370c4b-libxl-MigrateBegin.patch,
    99486799-libxl-MigrateConfirm.patch,
    f5eacf2a-libxl-MigratePerform.patch,
    4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
    fe51dbda-libxl-use-FindByRef.patch,
    60b3fcd9-libxl-MigratePrepare.patch,
    3c89868c-libxl-lock-after-ListRemove.patch,
    13e81fc6-libxl-EndJob-on-error.patch,
    594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
    c66e344e-libxl-dont-deref-NULL.patch,
    83edaf44-libxl-dont-hardcode-sched-weight.patch,
    apibuild-py3.patch

OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 21:47:55 +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.2.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.2.0/src/qemu/qemu_driver.c
@@ -17285,6 +17285,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;