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 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 17:27:32 +02:00
|
|
|
Index: libvirt-1.2.19/src/qemu/qemu_driver.c
|
2014-08-08 17:04:43 +02:00
|
|
|
===================================================================
|
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 17:27:32 +02:00
|
|
|
--- 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
|
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"),
|