pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 283072 from Virtualization

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/283072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2015-02-04 08:30:52 +00:00 committed by Git OBS Bridge
commit 479669cf89
25 changed files with 235 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
30c6aecc-apparmor-lib64.patch
View File

@ -1,73 +0,0 @@
From 30c6aecc449202e930249215c6514d6c13a46c83 Mon Sep 17 00:00:00 2001
From: Cedric Bosdonnat <cbosdonnat@suse.com>
Date: Mon, 15 Dec 2014 15:14:48 +0100
Subject: [PATCH] Teach AppArmor, that /usr/lib64 may exist.
The apparmor profiles forgot about /usr/lib64 folders, just add lib64
as a possible alternative to lib in the paths
---
examples/apparmor/libvirt-qemu | 2 +-
examples/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++--
examples/apparmor/usr.sbin.libvirtd | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
index c6de6dd..7aad391 100644
--- a/examples/apparmor/libvirt-qemu
+++ b/examples/apparmor/libvirt-qemu
@@ -111,7 +111,7 @@
/usr/bin/qemu-sparc32plus rmix,
/usr/bin/qemu-sparc64 rmix,
/usr/bin/qemu-x86_64 rmix,
- /usr/lib/qemu/block-curl.so mr,
+ /usr/{lib,lib64}/qemu/block-curl.so mr,
# for save and resume
/bin/dash rmix,
diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
index bceaaff..b34fb35 100644
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -1,7 +1,7 @@
# Last Modified: Mon Apr 5 15:10:27 2010
#include <tunables/global>
-/usr/lib/libvirt/virt-aa-helper {
+profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
#include <abstractions/base>
# needed for searching directories
@@ -20,7 +20,7 @@
/sys/devices/ r,
/sys/devices/** r,
- /usr/lib/libvirt/virt-aa-helper mr,
+ /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
/sbin/apparmor_parser Ux,
/etc/apparmor.d/libvirt/* r,
diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
index 3011eff..7151052 100644
--- a/examples/apparmor/usr.sbin.libvirtd
+++ b/examples/apparmor/usr.sbin.libvirtd
@@ -44,7 +44,7 @@
/usr/bin/* PUx,
/usr/sbin/* PUx,
/lib/udev/scsi_id PUx,
- /usr/lib/xen-common/bin/xen-toolstack PUx,
+ /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,
# force the use of virt-aa-helper
audit deny /sbin/apparmor_parser rwxl,
@@ -53,7 +53,7 @@
audit deny /sys/kernel/security/apparmor/matching rwxl,
audit deny /sys/kernel/security/apparmor/.* rwxl,
/sys/kernel/security/apparmor/profiles r,
- /usr/lib/libvirt/* PUxr,
+ /usr/{lib,lib64}/libvirt/* PUxr,
/etc/libvirt/hooks/** rmix,
/etc/xen/scripts/** rmix,
--
2.1.2

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/examples/apparmor/libvirt-lxc Index: libvirt-1.2.12/examples/apparmor/libvirt-lxc
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/examples/apparmor/libvirt-lxc --- libvirt-1.2.12.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.2.10/examples/apparmor/libvirt-lxc +++ libvirt-1.2.12/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@ @@ -2,39 +2,15 @@
#include <abstractions/base> #include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++ src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
Index: libvirt-1.2.10/src/qemu/qemu_driver.c Index: libvirt-1.2.12/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/qemu/qemu_driver.c --- libvirt-1.2.12.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.10/src/qemu/qemu_driver.c +++ libvirt-1.2.12/src/qemu/qemu_driver.c
@@ -15936,6 +15936,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt @@ -15954,6 +15954,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("non-file destination not supported yet")); _("non-file destination not supported yet"));
} }

22
disable-hugepage-test.patch Normal file
View File

@ -0,0 +1,22 @@
tests: disable hugepages-pages6 test on ppc architectures
hugepages-pages6 test in qemuxml2argvtest fails on all ppc, ppc64,
and ppc64le with the following error:
libvirt: QEMU Driver error : internal error: hugepage backing not
supported by '/usr/bin/qemu'.
Disable the test by applying this patch for arch in 'ppc ppc64 ppc64le'.
Index: libvirt-1.2.12/tests/qemuxml2argvtest.c
===================================================================
--- libvirt-1.2.12.orig/tests/qemuxml2argvtest.c
+++ libvirt-1.2.12/tests/qemuxml2argvtest.c
@@ -716,7 +716,6 @@ mymain(void)
DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH,
QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH);
- DO_TEST("hugepages-pages6", NONE);
DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);
DO_TEST("disk-cdrom", NONE);
DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,

59
disable-virCgroupGetPercpuStats-test.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/tests/vircgrouptest.c Index: libvirt-1.2.12/tests/vircgrouptest.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/tests/vircgrouptest.c --- libvirt-1.2.12.orig/tests/vircgrouptest.c
+++ libvirt-1.2.10/tests/vircgrouptest.c +++ libvirt-1.2.12/tests/vircgrouptest.c
@@ -33,7 +33,6 @@ @@ -33,7 +33,6 @@
# include "virlog.h" # include "virlog.h"
# include "virfile.h" # include "virfile.h"
@ -10,7 +10,7 @@ Index: libvirt-1.2.10/tests/vircgrouptest.c
# define VIR_FROM_THIS VIR_FROM_NONE # define VIR_FROM_THIS VIR_FROM_NONE
@@ -533,68 +532,6 @@ static int testCgroupAvailable(const voi @@ -533,91 +532,6 @@ static int testCgroupAvailable(const voi
return 0; return 0;
} }
@ -19,13 +19,35 @@ Index: libvirt-1.2.10/tests/vircgrouptest.c
- virCgroupPtr cgroup = NULL; - virCgroupPtr cgroup = NULL;
- size_t i; - size_t i;
- int rv, ret = -1; - int rv, ret = -1;
- virTypedParameter params[2]; - virTypedParameterPtr params = NULL;
-# define EXPECTED_NCPUS 160
- -
- // TODO: mock nodeGetCPUCount() as well & check 2nd cpu, too - unsigned long long expected[EXPECTED_NCPUS] = {
- unsigned long long expected[] = { - 0, 0, 0, 0, 0, 0, 0, 0,
- 1413142688153030ULL - 7059492996, 0, 0, 0, 0, 0, 0, 0,
- 4180532496, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 1957541268, 0, 0, 0, 0, 0, 0, 0,
- 2065932204, 0, 0, 0, 0, 0, 0, 0,
- 18228689414, 0, 0, 0, 0, 0, 0, 0,
- 4245525148, 0, 0, 0, 0, 0, 0, 0,
- 2911161568, 0, 0, 0, 0, 0, 0, 0,
- 1407758136, 0, 0, 0, 0, 0, 0, 0,
- 1836807700, 0, 0, 0, 0, 0, 0, 0,
- 1065296618, 0, 0, 0, 0, 0, 0, 0,
- 2046213266, 0, 0, 0, 0, 0, 0, 0,
- 747889778, 0, 0, 0, 0, 0, 0, 0,
- 709566900, 0, 0, 0, 0, 0, 0, 0,
- 444777342, 0, 0, 0, 0, 0, 0, 0,
- 5683512916, 0, 0, 0, 0, 0, 0, 0,
- 635751356, 0, 0, 0, 0, 0, 0, 0,
- }; - };
- -
- if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
- goto cleanup;
-
- if ((rv = virCgroupNewPartition("/virtualmachines", true, - if ((rv = virCgroupNewPartition("/virtualmachines", true,
- (1 << VIR_CGROUP_CONTROLLER_CPU) | - (1 << VIR_CGROUP_CONTROLLER_CPU) |
- (1 << VIR_CGROUP_CONTROLLER_CPUACCT), - (1 << VIR_CGROUP_CONTROLLER_CPUACCT),
@ -34,37 +56,37 @@ Index: libvirt-1.2.10/tests/vircgrouptest.c
- goto cleanup; - goto cleanup;
- } - }
- -
- if (nodeGetCPUCount() < 1) { - if (nodeGetCPUCount() != EXPECTED_NCPUS) {
- fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount()); - fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n", nodeGetCPUCount());
- goto cleanup; - goto cleanup;
- } - }
- -
- if ((rv = virCgroupGetPercpuStats(cgroup, - if ((rv = virCgroupGetPercpuStats(cgroup,
- params, - params,
- 2, 0, 1, 0)) < 0) { - 1, 0, EXPECTED_NCPUS, 0)) < 0) {
- fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv); - fprintf(stderr, "Failed call to virCgroupGetPercpuStats for /virtualmachines cgroup: %d\n", -rv);
- goto cleanup; - goto cleanup;
- } - }
- -
- for (i = 0; i < ARRAY_CARDINALITY(expected); i++) { - for (i = 0; i < EXPECTED_NCPUS; i++) {
- if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { - if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
- fprintf(stderr, - fprintf(stderr,
- "Wrong parameter name value from virCgroupGetPercpuStats (is: %s)\n", - "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n",
- params[i].field); - i, params[i].field);
- goto cleanup; - goto cleanup;
- } - }
- -
- if (params[i].type != VIR_TYPED_PARAM_ULLONG) { - if (params[i].type != VIR_TYPED_PARAM_ULLONG) {
- fprintf(stderr, - fprintf(stderr,
- "Wrong parameter value type from virCgroupGetPercpuStats (is: %d)\n", - "Wrong parameter value type from virCgroupGetPercpuStats at %zu (is: %d)\n",
- params[i].type); - i, params[i].type);
- goto cleanup; - goto cleanup;
- } - }
- -
- if (params[i].value.ul != expected[i]) { - if (params[i].value.ul != expected[i]) {
- fprintf(stderr, - fprintf(stderr,
- "Wrong value from virCgroupGetMemoryUsage (expected %llu)\n", - "Wrong value from virCgroupGetMemoryUsage at %zu (expected %llu)\n",
- params[i].value.ul); - i, params[i].value.ul);
- goto cleanup; - goto cleanup;
- } - }
- } - }
@ -73,13 +95,14 @@ Index: libvirt-1.2.10/tests/vircgrouptest.c
- -
- cleanup: - cleanup:
- virCgroupFree(&cgroup); - virCgroupFree(&cgroup);
- VIR_FREE(params);
- return ret; - return ret;
-} -}
- -
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED) static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
{ {
virCgroupPtr cgroup = NULL; virCgroupPtr cgroup = NULL;
@@ -800,9 +737,6 @@ mymain(void) @@ -823,9 +737,6 @@ mymain(void)
if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0) if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
ret = -1; ret = -1;

10
fix-pci-attach-xen-driver.patch
View File

@ -8,11 +8,11 @@ uses the 'device_configure' RPC.
This patch changes the xend driver to always call 'device_configure' for This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools. PCI devices to be consistent with the usage in the xen tools.
Index: libvirt-1.2.10/src/xen/xend_internal.c Index: libvirt-1.2.12/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/xen/xend_internal.c --- libvirt-1.2.12.orig/src/xen/xend_internal.c
+++ libvirt-1.2.10/src/xen/xend_internal.c +++ libvirt-1.2.12/src/xen/xend_internal.c
@@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr @@ -2216,6 +2216,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80]; char class[8], ref[80];
char *target = NULL; char *target = NULL;
@ -20,7 +20,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -2319,8 +2320,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr @@ -2314,8 +2315,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
} }
sexpr = virBufferContentAndReset(&buf); sexpr = virBufferContentAndReset(&buf);

3
libvirt-1.2.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc
size 30571605

7
libvirt-1.2.11.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlSLprsACgkQRga4pd6VvB9dIgCgiRsIp7IpLVT3rGLmJeGFlWIL
TIsAnimwS0VUT5YtHfkgNIzYOUjK7yq+
=Voyk
-----END PGP SIGNATURE-----

3
libvirt-1.2.12.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a
size 30710487

7
libvirt-1.2.12.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlTHRKkACgkQRga4pd6VvB9v3ACdFFlw9zp0ewEPOBt2e7cTDAL6
f7wAoJQBTFtnMKpgTMazQBUGBD9a02lb
=urda
-----END PGP SIGNATURE-----

62
libvirt-guests-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.2.10/tools/libvirt-guests.init.in Index: libvirt-1.2.12/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/tools/libvirt-guests.init.in --- libvirt-1.2.12.orig/tools/libvirt-guests.init.in
+++ libvirt-1.2.10/tools/libvirt-guests.init.in +++ libvirt-1.2.12/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
# the following is the LSB init header # the following is the LSB init header
# #
@ -28,10 +28,10 @@ Index: libvirt-1.2.10/tools/libvirt-guests.init.in
### END INIT INFO ### END INIT INFO
# the following is chkconfig init header # the following is chkconfig init header
Index: libvirt-1.2.10/tools/libvirt-guests.sh.in Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/tools/libvirt-guests.sh.in --- libvirt-1.2.12.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.2.10/tools/libvirt-guests.sh.in +++ libvirt-1.2.12/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@ @@ -16,14 +16,13 @@
# License along with this library. If not, see # License along with this library. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -84,16 +84,16 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
+ i=1 + i=1
+ rets=10 + rets=10
+ run_virsh $uri list > /dev/null 2>&1 + run_virsh $uri list > /dev/null 2>&1
+ while [ $? -ne 0 -a $i -lt $rets ]; do + while test $? -ne 0 && test $i -lt $rets; do
+ sleep 1 + sleep 1
+ echo -n . + echo -n .
+ i=$(($i + 1)) + i=$(($i + 1))
+ run_virsh $uri list > /dev/null 2>&1 + run_virsh $uri list > /dev/null 2>&1
+ done + done
+ if [ $i -eq $rets ]; then + if [ $i -eq $rets ]; then
+ eval_gettext "libvirt-guests unable to connect to URI: $uri" + eval_gettext "libvirt-guests unable to connect to URI: $uri"
+ echo + echo
+ return 1 + return 1
+ fi + fi
+ return 0 + return 0
+} +}
@ -101,7 +101,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
# test_connect URI # test_connect URI
# check if URI is reachable # check if URI is reachable
test_connect() test_connect()
@@ -116,7 +136,7 @@ list_guests() { @@ -116,7 +137,7 @@ list_guests() {
list=$(run_virsh_c "$uri" list --uuid $persistent) list=$(run_virsh_c "$uri" list --uuid $persistent)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -110,7 +110,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
return 1 return 1
fi fi
@@ -142,7 +162,7 @@ guest_is_on() { @@ -142,7 +163,7 @@ guest_is_on() {
guest_running=false guest_running=false
id=$(run_virsh "$uri" domid "$uuid") id=$(run_virsh "$uri" domid "$uuid")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -119,21 +119,21 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
return 1 return 1
fi fi
@@ -190,6 +210,13 @@ start() { @@ -190,6 +211,13 @@ start() {
test_connect "$uri" || continue test_connect "$uri" || continue
+ await_daemon_up $uri + await_daemon_up $uri
+ if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then
+ eval_gettext "Ignoring guests on $uri URI, can't connect" + eval_gettext "Ignoring guests on $uri URI, can't connect"
+ echo + echo
+ continue + continue
+ fi + fi
+ +
eval_gettext "Resuming guests on \$uri URI..."; echo eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do for guest in $list; do
name=$(guest_name "$uri" "$guest") name=$(guest_name "$uri" "$guest")
@@ -403,7 +429,7 @@ shutdown_guests_parallel() @@ -403,7 +431,7 @@ shutdown_guests_parallel()
timeout=$(($timeout - 1)) timeout=$(($timeout - 1))
if [ $timeout -le 0 ]; then if [ $timeout -le 0 ]; then
eval_gettext "Timeout expired while shutting down domains"; echo eval_gettext "Timeout expired while shutting down domains"; echo
@ -142,7 +142,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
return return
fi fi
else else
@@ -431,7 +457,7 @@ stop() { @@ -431,7 +459,7 @@ stop() {
if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then
gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0"
echo echo
@ -151,7 +151,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
return return
fi fi
fi fi
@@ -479,14 +505,14 @@ stop() { @@ -479,14 +507,14 @@ stop() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
eval_gettext "Failed to list persistent guests on \$uri" eval_gettext "Failed to list persistent guests on \$uri"
echo echo
@ -168,7 +168,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
set +f set +f
return return
fi fi
@@ -545,14 +571,13 @@ gueststatus() { @@ -545,14 +573,13 @@ gueststatus() {
rh_status() { rh_status() {
if [ -f "$LISTFILE" ]; then if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo gettext "stopped, with saved guests"; echo
@ -185,16 +185,16 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
fi fi
fi fi
} }
@@ -597,4 +622,4 @@ case "$1" in @@ -597,4 +624,4 @@ case "$1" in
usage usage
;; ;;
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-1.2.10/tools/libvirt-guests.sysconf Index: libvirt-1.2.12/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/tools/libvirt-guests.sysconf --- libvirt-1.2.12.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.2.10/tools/libvirt-guests.sysconf +++ libvirt-1.2.12/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

6
libvirt-power8-models.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.11/src/cpu/cpu_map.xml Index: libvirt-1.2.12/src/cpu/cpu_map.xml
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/src/cpu/cpu_map.xml --- libvirt-1.2.12.orig/src/cpu/cpu_map.xml
+++ libvirt-1.2.11/src/cpu/cpu_map.xml +++ libvirt-1.2.12/src/cpu/cpu_map.xml
@@ -657,5 +657,15 @@ @@ -657,5 +657,15 @@
<pvr value='0x004d0000'/> <pvr value='0x004d0000'/>
</model> </model>

50
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.11/configure.ac Index: libvirt-1.2.12/configure.ac
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/configure.ac --- libvirt-1.2.12.orig/configure.ac
+++ libvirt-1.2.11/configure.ac +++ libvirt-1.2.12/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL LIBVIRT_CHECK_HAL
@ -10,7 +10,7 @@ Index: libvirt-1.2.11/configure.ac
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PCIACCESS
@@ -2456,11 +2457,12 @@ if test "$with_libvirtd" = "no" ; then @@ -2459,11 +2460,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no with_interface=no
fi fi
@ -26,7 +26,7 @@ Index: libvirt-1.2.11/configure.ac
esac esac
if test "$with_interface" = "yes" ; then if test "$with_interface" = "yes" ; then
@@ -2895,6 +2897,7 @@ LIBVIRT_RESULT_FUSE @@ -2898,6 +2900,7 @@ LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NETCF
@ -34,22 +34,22 @@ Index: libvirt-1.2.11/configure.ac
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.2.11/src/Makefile.am Index: libvirt-1.2.12/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/src/Makefile.am --- libvirt-1.2.12.orig/src/Makefile.am
+++ libvirt-1.2.11/src/Makefile.am +++ libvirt-1.2.12/src/Makefile.am
@@ -859,6 +859,10 @@ if WITH_NETCF @@ -860,6 +860,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c interface/interface_backend_netcf.c
endif WITH_NETCF endif WITH_NETCF
+if WITH_NETCONTROL +if WITH_NETCONTROL
+INTERFACE_DRIVER_SOURCES += \ +INTERFACE_DRIVER_SOURCES += \
+ interface/interface_backend_netcf.c + interface/interface_backend_netcf.c
+endif +endif WITH_NETCONTROL
if WITH_UDEV if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c interface/interface_backend_udev.c
@@ -1502,10 +1506,15 @@ if WITH_NETCF @@ -1508,10 +1512,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF else ! WITH_NETCF
@ -65,11 +65,11 @@ Index: libvirt-1.2.11/src/Makefile.am
endif ! WITH_NETCF endif ! WITH_NETCF
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
Index: libvirt-1.2.11/tools/virsh.c Index: libvirt-1.2.12/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/tools/virsh.c --- libvirt-1.2.12.orig/tools/virsh.c
+++ libvirt-1.2.11/tools/virsh.c +++ libvirt-1.2.12/tools/virsh.c
@@ -3341,6 +3341,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE @@ -3348,6 +3348,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
vshPrint(ctl, " netcf"); vshPrint(ctl, " netcf");
@ -78,10 +78,10 @@ Index: libvirt-1.2.11/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-1.2.11/src/interface/interface_backend_netcf.c Index: libvirt-1.2.12/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/src/interface/interface_backend_netcf.c --- libvirt-1.2.12.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.2.11/src/interface/interface_backend_netcf.c +++ libvirt-1.2.12/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -102,7 +102,7 @@ Index: libvirt-1.2.11/src/interface/interface_backend_netcf.c
+#ifdef WITH_NETCONTROL +#ifdef WITH_NETCONTROL
+static void +static void
+interface_nc_log_driver(const char *category, +interface_nc_log_driver(const char *category ATTRIBUTE_UNUSED,
+ int priority, + int priority,
+ const char *func, + const char *func,
+ const char *file, + const char *file,
@ -112,7 +112,7 @@ Index: libvirt-1.2.11/src/interface/interface_backend_netcf.c
+{ +{
+ int vp; + int vp;
+ +
+ switch(priority) { + switch (priority) {
+ case NC_LOG_FATAL: + case NC_LOG_FATAL:
+ case NC_LOG_ERROR: + case NC_LOG_ERROR:
+ vp = VIR_LOG_ERROR; + vp = VIR_LOG_ERROR;
@ -165,10 +165,10 @@ Index: libvirt-1.2.11/src/interface/interface_backend_netcf.c
return 0; return 0;
} }
Index: libvirt-1.2.11/src/interface/interface_driver.c Index: libvirt-1.2.12/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/src/interface/interface_driver.c --- libvirt-1.2.12.orig/src/interface/interface_driver.c
+++ libvirt-1.2.11/src/interface/interface_driver.c +++ libvirt-1.2.12/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void) @@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0) if (netcfIfaceRegister() == 0)
return 0; return 0;
@ -186,10 +186,10 @@ Index: libvirt-1.2.11/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-1.2.11/m4/virt-netcontrol.m4 Index: libvirt-1.2.12/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.11/m4/virt-netcontrol.m4 +++ libvirt-1.2.12/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl

29
libvirt.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Tue Jan 27 15:45:56 MST 2015 - jfehlig@suse.com
- Update to libvirt 1.2.12
- CVE-2015-0236: qemu: Check ACLs when dumping security info
from snapshots
- CVE-2015-0236: qemu: Check ACLs when dumping security info
from save image
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patches: 30c6aecc-apparmor-lib64.patch,
apparmor-xen-fixup.patch, apparmor-allow-helpers.patch,
apparmor-tck-raw-packets.patch
- Disable a hugepage test that is failing on ppc, ppc64, and
ppc64le architectures - disable-hugepage-test.patch
-------------------------------------------------------------------
Tue Jan 20 13:29:02 UTC 2015 - cbosdonnat@suse.com
- Fixed patches to pass make syntax-check
-------------------------------------------------------------------
Tue Jan 20 01:46:52 UTC 2015 - mlatimer@suse.com
- Apparmor profile regression breaks Xen domains. bsc#913799
apparmor-xen-fixup.patch
apparmor-allow-helpers.patch
apparmor-tck-raw-packets.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 5 09:44:12 UTC 2015 - cbosdonnat@suse.com Mon Jan 5 09:44:12 UTC 2015 - cbosdonnat@suse.com

10
libvirt.spec
View File

@ -235,7 +235,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 1.2.11 Version: 1.2.12
Release: 0 Release: 0
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
License: LGPL-2.1+ License: LGPL-2.1+
@ -434,7 +434,6 @@ Source3: libvirtd.init
Source4: libvirtd-relocation-server.fw Source4: libvirtd-relocation-server.fw
Source99: baselibs.conf Source99: baselibs.conf
# Upstream patches # Upstream patches
Patch0: 30c6aecc-apparmor-lib64.patch
# Patches pending upstream review # Patches pending upstream review
# Need to go upstream # Need to go upstream
Patch150: xen-name-for-devid.patch Patch150: xen-name-for-devid.patch
@ -453,6 +452,9 @@ Patch206: support-managed-pci-xen-driver.patch
Patch207: systemd-service-xen.patch Patch207: systemd-service-xen.patch
# Disable failing virCgroupGetPercpuStats unit test # Disable failing virCgroupGetPercpuStats unit test
Patch208: disable-virCgroupGetPercpuStats-test.patch Patch208: disable-virCgroupGetPercpuStats-test.patch
%ifarch ppc ppc64 ppc64le
Patch209: disable-hugepage-test.patch
%endif
%if %{with_apparmor} %if %{with_apparmor}
Patch250: apparmor-no-mount.patch Patch250: apparmor-no-mount.patch
Patch251: qemu-apparmor-screenshot.patch Patch251: qemu-apparmor-screenshot.patch
@ -965,7 +967,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch150 -p1 %patch150 -p1
%patch151 -p1 %patch151 -p1
%patch152 -p1 %patch152 -p1
@ -980,6 +981,9 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
%patch206 -p1 %patch206 -p1
%patch207 -p1 %patch207 -p1
%patch208 -p1 %patch208 -p1
%ifarch ppc ppc64 ppc64le
%patch209 -p1
%endif
%if %{with_apparmor} %if %{with_apparmor}
%patch250 -p1 %patch250 -p1
%patch251 -p1 %patch251 -p1

20
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/daemon/libvirtd.conf Index: libvirt-1.2.12/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/daemon/libvirtd.conf --- libvirt-1.2.12.orig/daemon/libvirtd.conf
+++ libvirt-1.2.10/daemon/libvirtd.conf +++ libvirt-1.2.12/daemon/libvirtd.conf
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -13,11 +13,11 @@ Index: libvirt-1.2.10/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to # NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-1.2.10/daemon/libvirtd-config.c Index: libvirt-1.2.12/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/daemon/libvirtd-config.c --- libvirt-1.2.12.orig/daemon/libvirtd-config.c
+++ libvirt-1.2.10/daemon/libvirtd-config.c +++ libvirt-1.2.12/daemon/libvirtd-config.c
@@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
return NULL; return NULL;
@ -26,10 +26,10 @@ Index: libvirt-1.2.10/daemon/libvirtd-config.c
data->listen_tcp = 0; data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-1.2.10/daemon/test_libvirtd.aug.in Index: libvirt-1.2.12/daemon/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/daemon/test_libvirtd.aug.in --- libvirt-1.2.12.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.2.10/daemon/test_libvirtd.aug.in +++ libvirt-1.2.12/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd = @@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG:: ::CONFIG::

6
libvirtd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-1.2.10/daemon/libvirtd.sysconf Index: libvirt-1.2.12/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/daemon/libvirtd.sysconf --- libvirt-1.2.12.orig/daemon/libvirtd.sysconf
+++ libvirt-1.2.10/daemon/libvirtd.sysconf +++ libvirt-1.2.12/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956 See bnc#894956
Index: libvirt-1.2.10/src/util/virarch.c Index: libvirt-1.2.12/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/util/virarch.c --- libvirt-1.2.12.orig/src/util/virarch.c
+++ libvirt-1.2.10/src/util/virarch.c +++ libvirt-1.2.12/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void) @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686; arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) { } else if (STREQ(ut.machine, "amd64")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.11/examples/apparmor/libvirt-qemu Index: libvirt-1.2.12/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-1.2.11.orig/examples/apparmor/libvirt-qemu --- libvirt-1.2.12.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.2.11/examples/apparmor/libvirt-qemu +++ libvirt-1.2.12/examples/apparmor/libvirt-qemu
@@ -124,6 +124,9 @@ @@ -124,6 +124,9 @@
/sys/bus/ r, /sys/bus/ r,
/sys/class/ r, /sys/class/ r,

18
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-) 2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-1.2.10/src/xenconfig/xen_common.c Index: libvirt-1.2.12/src/xenconfig/xen_common.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/xenconfig/xen_common.c --- libvirt-1.2.12.orig/src/xenconfig/xen_common.c
+++ libvirt-1.2.10/src/xenconfig/xen_common.c +++ libvirt-1.2.12/src/xenconfig/xen_common.c
@@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe @@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{ {
virConfValuePtr list = virConfGetValue(conf, "pci"); virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-1.2.10/src/xenconfig/xen_common.c
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID; hostdev->source.subsys.u.pci.addr.bus = busID;
Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c Index: libvirt-1.2.12/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.2.12.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c +++ libvirt-1.2.12/src/xenconfig/xen_sxpr.c
@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID; int busID;
int slotID; int slotID;
@ -93,7 +93,7 @@ Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c
dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.domain = domainID;
dev->source.subsys.u.pci.addr.bus = busID; dev->source.subsys.u.pci.addr.bus = busID;
@@ -1993,11 +1996,15 @@ static void @@ -2005,11 +2008,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def, xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf) virBufferPtr buf)
{ {
@ -110,7 +110,7 @@ Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c
} }
@@ -2016,12 +2023,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP @@ -2028,12 +2035,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf, virBufferPtr buf,
int detach) int detach)
{ {
@ -123,7 +123,7 @@ Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c
virBufferAddLit(buf, "(pci "); virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf); xenFormatSxprPCI(def, buf);
if (detach) if (detach)
@@ -2076,12 +2077,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, @@ -2088,12 +2089,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {

12
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/src/qemu/qemu.conf Index: libvirt-1.2.12/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/qemu/qemu.conf --- libvirt-1.2.12.orig/src/qemu/qemu.conf
+++ libvirt-1.2.10/src/qemu/qemu.conf +++ libvirt-1.2.12/src/qemu/qemu.conf
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
# If set to non-zero, then the default security labeling # If set to non-zero, then the default security labeling
@ -39,10 +39,10 @@ Index: libvirt-1.2.10/src/qemu/qemu.conf
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-1.2.10/src/qemu/qemu_conf.c Index: libvirt-1.2.12/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/qemu/qemu_conf.c --- libvirt-1.2.12.orig/src/qemu/qemu_conf.c
+++ libvirt-1.2.10/src/qemu/qemu_conf.c +++ libvirt-1.2.12/src/qemu/qemu_conf.c
@@ -249,7 +249,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf @@ -249,7 +249,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
cfg->clearEmulatorCapabilities = true; cfg->clearEmulatorCapabilities = true;

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/daemon/libvirtd.service.in Index: libvirt-1.2.12/daemon/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/daemon/libvirtd.service.in --- libvirt-1.2.12.orig/daemon/libvirtd.service.in
+++ libvirt-1.2.10/daemon/libvirtd.service.in +++ libvirt-1.2.12/daemon/libvirtd.service.in
@@ -5,6 +5,8 @@ After=network.target @@ -5,6 +5,8 @@ After=network.target
After=dbus.service After=dbus.service
After=iscsid.service After=iscsid.service

12
virtlockd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards Adjust virtlockd init files to conform to SUSE standards
Index: libvirt-1.2.10/src/locking/virtlockd.sysconf Index: libvirt-1.2.12/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/locking/virtlockd.sysconf --- libvirt-1.2.12.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.2.10/src/locking/virtlockd.sysconf +++ libvirt-1.2.12/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +
@ -12,10 +12,10 @@ Index: libvirt-1.2.10/src/locking/virtlockd.sysconf
# #
# Pass extra arguments to virtlockd # Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS= #VIRTLOCKD_ARGS=
Index: libvirt-1.2.10/src/locking/virtlockd.init.in Index: libvirt-1.2.12/src/locking/virtlockd.init.in
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/locking/virtlockd.init.in --- libvirt-1.2.12.orig/src/locking/virtlockd.init.in
+++ libvirt-1.2.10/src/locking/virtlockd.init.in +++ libvirt-1.2.12/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@ @@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
# #

19
xen-name-for-devid.patch
View File

@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is is inactive. We obviously can't search xenstore when the domain is
inactive. inactive.
Index: libvirt-1.2.10/src/xen/xend_internal.c Index: libvirt-1.2.12/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/xen/xend_internal.c --- libvirt-1.2.12.orig/src/xen/xend_internal.c
+++ libvirt-1.2.10/src/xen/xend_internal.c +++ libvirt-1.2.12/src/xen/xend_internal.c
@@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal");
#define XEND_RCV_BUF_MAX_LEN (256 * 1024) #define XEND_RCV_BUF_MAX_LEN (256 * 1024)
@ -27,7 +27,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
virDomainDeviceDefPtr dev, char *class, virDomainDeviceDefPtr dev, char *class,
char *ref, int ref_len); char *ref, int ref_len);
@@ -3325,37 +3325,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c @@ -3319,37 +3319,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
static int static int
@ -42,7 +42,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
- xenUnifiedPrivatePtr priv = conn->privateData; - xenUnifiedPrivatePtr priv = conn->privateData;
- char *xref; - char *xref;
- char *tmp; - char *tmp;
+ unsigned int i; + size_t i;
const char *driver = virDomainDiskGetDriver(dev->data.disk); const char *driver = virDomainDiskGetDriver(dev->data.disk);
if (dev->type == VIR_DOMAIN_DEVICE_DISK) { if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
@ -80,7 +80,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) { } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
char mac[VIR_MAC_STRING_BUFLEN]; char mac[VIR_MAC_STRING_BUFLEN];
virDomainNetDefPtr netdef = dev->data.net; virDomainNetDefPtr netdef = dev->data.net;
@@ -3363,16 +3361,22 @@ virDomainXMLDevID(virConnectPtr conn, @@ -3357,16 +3355,22 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "vif"); strcpy(class, "vif");
@ -113,7 +113,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
@@ -3388,17 +3392,44 @@ virDomainXMLDevID(virConnectPtr conn, @@ -3382,17 +3386,43 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "pci"); strcpy(class, "pci");
@ -124,7 +124,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
- if (xref == NULL) - if (xref == NULL)
- return -1; - return -1;
+ /* For PCI devices, the device BFD can be used directly. */ + /* For PCI devices, the device BFD can be used directly. */
+ for (i = 0 ; i < def->nhostdevs ; i++) { + for (i = 0; i < def->nhostdevs; i++) {
+ char *dst_bdf; + char *dst_bdf;
+ virDomainHostdevDefPtr hostdev = def->hostdevs[i]; + virDomainHostdevDefPtr hostdev = def->hostdevs[i];
+ +
@ -153,8 +153,7 @@ Index: libvirt-1.2.10/src/xen/xend_internal.c
+ VIR_FREE(dst_bdf); + VIR_FREE(dst_bdf);
+ VIR_FREE(bdf); + VIR_FREE(bdf);
+ return -1; + return -1;
+ } + } else {
+ else {
+ VIR_FREE(dst_bdf); + VIR_FREE(dst_bdf);
+ VIR_FREE(bdf); + VIR_FREE(bdf);
+ return 0; + return 0;

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c Index: libvirt-1.2.12/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.2.12.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c +++ libvirt-1.2.12/src/xenconfig/xen_sxpr.c
@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,