Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2014-12-03 22:48:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11-26
10:34:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-12-03
22:49:16.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 3 05:01:13 MST 2014 - jfeh...@suse.com
+
+- qemu: Fix crash in tunnelled migration
+ 52691f99-qemu-mig-crash.patch
+ boo#908008
+
+-------------------------------------------------------------------
New:
----
52691f99-qemu-mig-crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.i6pjsp/_old 2014-12-03 22:49:18.000000000 +0100
+++ /var/tmp/diff_new_pack.i6pjsp/_new 2014-12-03 22:49:18.000000000 +0100
@@ -440,6 +440,7 @@
Patch3: 433b427-iplink-name.patch
Patch4: 72fecf1-lxc-resolve-symlinks.patch
Patch5: e50457d-lxc-unmount-check.patch
+Patch6: 52691f99-qemu-mig-crash.patch
# Patches pending upstream review
# Need to go upstream
Patch150: xen-name-for-devid.patch
@@ -978,6 +979,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
++++++ 433b427-iplink-name.patch ++++++
--- /var/tmp/diff_new_pack.i6pjsp/_old 2014-12-03 22:49:18.000000000 +0100
+++ /var/tmp/diff_new_pack.i6pjsp/_new 2014-12-03 22:49:18.000000000 +0100
@@ -13,11 +13,11 @@
src/util/virnetdevveth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
-index e9d6f9c..ad30e1d 100644
---- a/src/util/virnetdevveth.c
-+++ b/src/util/virnetdevveth.c
-@@ -89,7 +89,7 @@ static int virNetDevVethGetFreeNum(int startDev)
+Index: libvirt-1.2.10/src/util/virnetdevveth.c
+===================================================================
+--- libvirt-1.2.10.orig/src/util/virnetdevveth.c
++++ libvirt-1.2.10/src/util/virnetdevveth.c
+@@ -89,7 +89,7 @@ static int virNetDevVethGetFreeNum(int s
* @veth2: pointer to return name for container end of veth pair
*
* Creates a veth device pair using the ip command:
@@ -26,7 +26,7 @@
* If veth1 points to NULL on entry, it will be a valid interface on
* return. veth2 should point to NULL on entry.
*
-@@ -146,7 +146,7 @@ int virNetDevVethCreate(char** veth1, char** veth2)
+@@ -146,7 +146,7 @@ int virNetDevVethCreate(char** veth1, ch
}
cmd = virCommandNew("ip");
@@ -35,6 +35,3 @@
*veth1 ? *veth1 : veth1auto,
"type", "veth", "peer", "name",
*veth2 ? *veth2 : veth2auto,
---
-2.1.2
-
++++++ 52691f99-qemu-mig-crash.patch ++++++
commit 52691f99fa016ac46c9546c37706e57a5180d4c6
Author: Jiri Denemark <jdene...@redhat.com>
Date: Thu Nov 20 13:09:16 2014 +0100
qemu: Fix crash in tunnelled migration
Any attempt to start a tunnelled migration with libvirtd that supports
RDMA migration (specifically commit v1.2.8-226-ged22a47) crashes
libvirtd on the destination host.
The crash is inevitable because qemuMigrationPrepareAny is always called
with NULL protocol in case of tunnelled migration.
https://bugzilla.redhat.com/show_bug.cgi?id=1147331
Signed-off-by: Jiri Denemark <jdene...@redhat.com>
Index: libvirt-1.2.10/src/qemu/qemu_migration.c
===================================================================
--- libvirt-1.2.10.orig/src/qemu/qemu_migration.c
+++ libvirt-1.2.10/src/qemu/qemu_migration.c
@@ -2688,7 +2688,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr
QEMU_MIGRATION_COOKIE_NBD)))
goto cleanup;
- if (STREQ(protocol, "rdma") && !vm->def->mem.hard_limit) {
+ if (STREQ_NULLABLE(protocol, "rdma") && !vm->def->mem.hard_limit) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot start RDMA migration with no memory hard "
"limit set"));
++++++ 72fecf1-lxc-resolve-symlinks.patch ++++++
--- /var/tmp/diff_new_pack.i6pjsp/_old 2014-12-03 22:49:18.000000000 +0100
+++ /var/tmp/diff_new_pack.i6pjsp/_new 2014-12-03 22:49:18.000000000 +0100
@@ -17,11 +17,11 @@
src/lxc/lxc_container.c | 77 ++++++++++++++++++++++++++++++++++---------------
2 files changed, 54 insertions(+), 24 deletions(-)
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index d428451..dcb30bc 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -821,6 +821,7 @@ struct _virDomainFSDef {
+Index: libvirt-1.2.10/src/conf/domain_conf.h
+===================================================================
+--- libvirt-1.2.10.orig/src/conf/domain_conf.h
++++ libvirt-1.2.10/src/conf/domain_conf.h
+@@ -814,6 +814,7 @@ struct _virDomainFSDef {
virDomainDeviceInfo info;
unsigned long long space_hard_limit; /* in bytes */
unsigned long long space_soft_limit; /* in bytes */
@@ -29,11 +29,11 @@
};
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index db823d6..12f3a41 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -608,6 +608,48 @@ static int lxcContainerUnmountSubtree(const char *prefix,
+Index: libvirt-1.2.10/src/lxc/lxc_container.c
+===================================================================
+--- libvirt-1.2.10.orig/src/lxc/lxc_container.c
++++ libvirt-1.2.10/src/lxc/lxc_container.c
+@@ -609,6 +609,48 @@ static int lxcContainerUnmountSubtree(co
return ret;
}
@@ -82,7 +82,7 @@
static int lxcContainerPrepareRoot(virDomainDefPtr def,
virDomainFSDefPtr root,
-@@ -634,6 +676,9 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def,
+@@ -635,6 +677,9 @@ static int lxcContainerPrepareRoot(virDo
return -1;
}
@@ -92,7 +92,7 @@
if (virAsprintf(&dst, "%s/%s.root",
LXC_STATE_DIR, def->name) < 0)
return -1;
-@@ -1552,6 +1597,9 @@ static int lxcContainerMountAllFS(virDomainDefPtr vmDef,
+@@ -1555,6 +1600,9 @@ static int lxcContainerMountAllFS(virDom
if (STREQ(vmDef->fss[i]->dst, "/"))
continue;
@@ -102,7 +102,7 @@
if (lxcContainerUnmountSubtree(vmDef->fss[i]->dst,
false) < 0)
return -1;
-@@ -1735,37 +1783,18 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr
vmDef,
+@@ -1738,37 +1786,18 @@ static int lxcContainerSetupPivotRoot(vi
return ret;
}
@@ -144,7 +144,7 @@
}
VIR_DEBUG("Resolved all filesystem symlinks");
-@@ -2106,7 +2135,7 @@ static int lxcContainerChild(void *data)
+@@ -2107,7 +2136,7 @@ static int lxcContainerChild(void *data)
goto cleanup;
}
@@ -153,6 +153,3 @@
goto cleanup;
VIR_DEBUG("Setting up pivot");
---
-2.1.2
-
++++++ c264eea-virt-aa-helper-sandbox.patch ++++++
--- /var/tmp/diff_new_pack.i6pjsp/_old 2014-12-03 22:49:18.000000000 +0100
+++ /var/tmp/diff_new_pack.i6pjsp/_new 2014-12-03 22:49:18.000000000 +0100
@@ -10,11 +10,11 @@
src/security/virt-aa-helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index 81f9f40..f273e09 100644
---- a/src/security/virt-aa-helper.c
-+++ b/src/security/virt-aa-helper.c
-@@ -571,7 +571,8 @@ valid_path(const char *path, const bool readonly)
+Index: libvirt-1.2.10/src/security/virt-aa-helper.c
+===================================================================
+--- libvirt-1.2.10.orig/src/security/virt-aa-helper.c
++++ libvirt-1.2.10/src/security/virt-aa-helper.c
+@@ -571,7 +571,8 @@ valid_path(const char *path, const bool
};
/* override the above with these */
const char * const override[] = {
@@ -24,6 +24,3 @@
};
if (path == NULL) {
---
-2.1.2
-
++++++ e50457d-lxc-unmount-check.patch ++++++
--- /var/tmp/diff_new_pack.i6pjsp/_old 2014-12-03 22:49:18.000000000 +0100
+++ /var/tmp/diff_new_pack.i6pjsp/_new 2014-12-03 22:49:18.000000000 +0100
@@ -18,11 +18,11 @@
src/lxc/lxc_container.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 12f3a41..334a1df 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -1597,11 +1597,15 @@ static int lxcContainerMountAllFS(virDomainDefPtr
vmDef,
+Index: libvirt-1.2.10/src/lxc/lxc_container.c
+===================================================================
+--- libvirt-1.2.10.orig/src/lxc/lxc_container.c
++++ libvirt-1.2.10/src/lxc/lxc_container.c
+@@ -1600,11 +1600,15 @@ static int lxcContainerMountAllFS(virDom
if (STREQ(vmDef->fss[i]->dst, "/"))
continue;
@@ -40,6 +40,3 @@
return -1;
if (lxcContainerMountFS(vmDef->fss[i], sec_mount_options) < 0)
---
-2.1.2
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
