Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-08-16 15:38:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-08-05 10:24:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-08-16 15:38:17.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 8 03:23:10 UTC 2014 - [email protected] + +- bnc#820399 - virsh blockcopy should refuse identical device + blockcopy-check-dst-identical-device.patch + +------------------------------------------------------------------- @@ -28,0 +35 @@ + New: ---- blockcopy-check-dst-identical-device.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.RTdnX6/_old 2014-08-16 15:38:19.000000000 +0200 +++ /var/tmp/diff_new_pack.RTdnX6/_new 2014-08-16 15:38:19.000000000 +0200 @@ -431,6 +431,7 @@ # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: xen-pv-cdrom.patch +Patch102: blockcopy-check-dst-identical-device.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -944,6 +945,7 @@ %setup -q %patch100 -p1 %patch101 -p1 +%patch102 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 ++++++ blockcopy-check-dst-identical-device.patch ++++++ >From 475b272c126d53f3985860422dc96b01b470423e Mon Sep 17 00:00:00 2001 From: Chunyan Liu <[email protected]> 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 <[email protected]> --- src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) Index: libvirt-1.2.7/src/qemu/qemu_driver.c =================================================================== --- libvirt-1.2.7.orig/src/qemu/qemu_driver.c +++ libvirt-1.2.7/src/qemu/qemu_driver.c @@ -15330,6 +15330,13 @@ qemuDomainBlockCopy(virDomainObjPtr vm, } /* Prepare the destination file. */ + if (STREQ_NULLABLE(realpath(disk->src->path, NULL), realpath(dest, NULL))) { + virReportError(VIR_ERR_INVALID_ARG, + _("destination '%s' is the same as disk '%s' source"), + dest, path); + goto endjob; + } + if (stat(dest, &st) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("unable to stat for disk %s: %s"), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
