Accepting request 305479 from Virtualization
Supersedes SR#305345. Update to libvirt 1.2.15 and fix bsc#875216. - libxl: support virtual sound devices in HVM domains c0d3f608-libxl-soundhw.patch bsc#875216 - Update to libvirt 1.2.15 - Implement virDomainAddIOThread and virDomainDelIOThread - libxl: Introduce configuration file for libxl driver - Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Drop upstream patches da33a1ac-lxc-init-statedir.patch and open-ns-files-readonly.patch - spec file fixups for building --without-driver-modules OBS-URL: https://build.opensuse.org/request/show/305479 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=177
This commit is contained in:
commit
60184accf5
@ -1,30 +1,11 @@
|
|||||||
Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu
|
Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu
|
--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
|
||||||
+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu
|
+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu
|
||||||
@@ -59,6 +59,7 @@
|
@@ -124,6 +124,9 @@
|
||||||
# access to firmware's etc
|
# for restore
|
||||||
/usr/share/kvm/** r,
|
/bin/bash rmix,
|
||||||
/usr/share/qemu/** r,
|
|
||||||
+ /usr/share/qemu-kvm/** r,
|
|
||||||
/usr/share/bochs/** r,
|
|
||||||
/usr/share/openbios/** r,
|
|
||||||
/usr/share/openhackware/** r,
|
|
||||||
@@ -73,6 +74,7 @@
|
|
||||||
# the various binaries
|
|
||||||
/usr/bin/kvm rmix,
|
|
||||||
/usr/bin/qemu rmix,
|
|
||||||
+ /usr/bin/qemu-kvm rmix,
|
|
||||||
/usr/bin/qemu-system-arm rmix,
|
|
||||||
/usr/bin/qemu-system-cris rmix,
|
|
||||||
/usr/bin/qemu-system-i386 rmix,
|
|
||||||
@@ -118,6 +120,12 @@
|
|
||||||
/bin/dd rmix,
|
|
||||||
/bin/cat rmix,
|
|
||||||
|
|
||||||
+ # for restore
|
|
||||||
+ /bin/bash rmix,
|
|
||||||
+
|
|
||||||
+ /run/nscd/passwd r,
|
+ /run/nscd/passwd r,
|
||||||
+ /run/nscd/group r,
|
+ /run/nscd/group r,
|
||||||
+
|
+
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/examples/apparmor/libvirt-lxc
|
Index: libvirt-1.2.15/examples/apparmor/libvirt-lxc
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/examples/apparmor/libvirt-lxc
|
--- libvirt-1.2.15.orig/examples/apparmor/libvirt-lxc
|
||||||
+++ libvirt-1.2.14/examples/apparmor/libvirt-lxc
|
+++ libvirt-1.2.15/examples/apparmor/libvirt-lxc
|
||||||
@@ -2,39 +2,15 @@
|
@@ -2,39 +2,15 @@
|
||||||
|
|
||||||
#include <abstractions/base>
|
#include <abstractions/base>
|
||||||
|
@ -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.14/src/qemu/qemu_driver.c
|
Index: libvirt-1.2.15/src/qemu/qemu_driver.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/qemu/qemu_driver.c
|
--- libvirt-1.2.15.orig/src/qemu/qemu_driver.c
|
||||||
+++ libvirt-1.2.14/src/qemu/qemu_driver.c
|
+++ libvirt-1.2.15/src/qemu/qemu_driver.c
|
||||||
@@ -16644,6 +16644,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
@@ -17019,6 +17019,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
|
||||||
_("non-file destination not supported yet"));
|
_("non-file destination not supported yet"));
|
||||||
goto endjob;
|
goto endjob;
|
||||||
}
|
}
|
||||||
|
33
c0d3f608-libxl-soundhw.patch
Normal file
33
c0d3f608-libxl-soundhw.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
commit c0d3f608d6981c69f03d19252308a09545d1ab84
|
||||||
|
Author: Jim Fehlig <jfehlig@suse.com>
|
||||||
|
Date: Mon May 4 13:50:10 2015 -0600
|
||||||
|
|
||||||
|
libxl: support soundhw for hvm domains
|
||||||
|
|
||||||
|
The xend driver and the parsing/formating code in src/xenconfig
|
||||||
|
have long supported soundhw. Add support in the libxl driver too.
|
||||||
|
|
||||||
|
Index: libvirt-1.2.15/src/libxl/libxl_conf.c
|
||||||
|
===================================================================
|
||||||
|
--- libvirt-1.2.15.orig/src/libxl/libxl_conf.c
|
||||||
|
+++ libvirt-1.2.15/src/libxl/libxl_conf.c
|
||||||
|
@@ -678,6 +678,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr de
|
||||||
|
libxl_defbool_set(&b_info->u.hvm.hpet, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (def->nsounds > 0) {
|
||||||
|
+ /*
|
||||||
|
+ * Use first sound device. man xl.cfg(5) describes soundhw as
|
||||||
|
+ * a single device. From the man page: soundhw=DEVICE
|
||||||
|
+ */
|
||||||
|
+ virDomainSoundDefPtr snd = def->sounds[0];
|
||||||
|
+
|
||||||
|
+ if (VIR_STRDUP(b_info->u.hvm.soundhw,
|
||||||
|
+ virDomainSoundModelTypeToString(snd->model)) < 0)
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
for (i = 0; i < def->os.nBootDevs; i++) {
|
||||||
|
switch (def->os.bootDevs[i]) {
|
||||||
|
case VIR_DOMAIN_BOOT_FLOPPY:
|
@ -1,38 +0,0 @@
|
|||||||
From da33a1ac1f6c0ae2ebe72bc385bbc7c407026956 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
||||||
Date: Wed, 8 Apr 2015 19:16:52 +0200
|
|
||||||
Subject: [PATCH] lxc: create the required directories upon driver start
|
|
||||||
|
|
||||||
/var/run may reside on a tmpfs and we fail to create the PID file if
|
|
||||||
/var/run/lxc does not exist.
|
|
||||||
|
|
||||||
Since commit 0a8addc1, the lxc driver's state directory isn't
|
|
||||||
automatically created before starting a domain. Now, the lxc driver
|
|
||||||
makes sure the state directory exists when it initializes.
|
|
||||||
|
|
||||||
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
|
||||||
---
|
|
||||||
src/lxc/lxc_driver.c | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
|
|
||||||
index 245000d..8dfa686 100644
|
|
||||||
--- a/src/lxc/lxc_driver.c
|
|
||||||
+++ b/src/lxc/lxc_driver.c
|
|
||||||
@@ -1648,6 +1648,13 @@ static int lxcStateInitialize(bool privileged,
|
|
||||||
if (!(caps = virLXCDriverGetCapabilities(lxc_driver, false)))
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
+ if (virFileMakePath(cfg->stateDir) < 0) {
|
|
||||||
+ virReportSystemError(errno,
|
|
||||||
+ _("Failed to mkdir %s"),
|
|
||||||
+ cfg->stateDir);
|
|
||||||
+ goto cleanup;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* Get all the running persistent or transient configs first */
|
|
||||||
if (virDomainObjListLoadAllConfigs(lxc_driver->domains,
|
|
||||||
cfg->stateDir,
|
|
||||||
--
|
|
||||||
2.1.4
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/tests/vircgrouptest.c
|
Index: libvirt-1.2.15/tests/vircgrouptest.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/tests/vircgrouptest.c
|
--- libvirt-1.2.15.orig/tests/vircgrouptest.c
|
||||||
+++ libvirt-1.2.14/tests/vircgrouptest.c
|
+++ libvirt-1.2.15/tests/vircgrouptest.c
|
||||||
@@ -34,7 +34,6 @@
|
@@ -34,7 +34,6 @@
|
||||||
# include "virfile.h"
|
# include "virfile.h"
|
||||||
# include "virbuffer.h"
|
# include "virbuffer.h"
|
||||||
@ -10,8 +10,8 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c
|
|||||||
|
|
||||||
# define VIR_FROM_THIS VIR_FROM_NONE
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
||||||
|
|
||||||
@@ -586,91 +585,6 @@ static int testCgroupAvailable(const voi
|
@@ -607,91 +606,6 @@ static int testCgroupControllerAvailable
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
-static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
|
-static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
|
||||||
@ -24,25 +24,25 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c
|
|||||||
-
|
-
|
||||||
- unsigned long long expected[EXPECTED_NCPUS] = {
|
- unsigned long long expected[EXPECTED_NCPUS] = {
|
||||||
- 0, 0, 0, 0, 0, 0, 0, 0,
|
- 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 7059492996, 0, 0, 0, 0, 0, 0, 0,
|
- 7059492996ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 4180532496, 0, 0, 0, 0, 0, 0, 0,
|
- 4180532496ULL, 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,
|
- 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,
|
- 1957541268ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 2065932204, 0, 0, 0, 0, 0, 0, 0,
|
- 2065932204ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 18228689414, 0, 0, 0, 0, 0, 0, 0,
|
- 18228689414ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 4245525148, 0, 0, 0, 0, 0, 0, 0,
|
- 4245525148ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 2911161568, 0, 0, 0, 0, 0, 0, 0,
|
- 2911161568ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 1407758136, 0, 0, 0, 0, 0, 0, 0,
|
- 1407758136ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 1836807700, 0, 0, 0, 0, 0, 0, 0,
|
- 1836807700ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 1065296618, 0, 0, 0, 0, 0, 0, 0,
|
- 1065296618ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 2046213266, 0, 0, 0, 0, 0, 0, 0,
|
- 2046213266ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 747889778, 0, 0, 0, 0, 0, 0, 0,
|
- 747889778ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 709566900, 0, 0, 0, 0, 0, 0, 0,
|
- 709566900ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 444777342, 0, 0, 0, 0, 0, 0, 0,
|
- 444777342ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 5683512916, 0, 0, 0, 0, 0, 0, 0,
|
- 5683512916ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- 635751356, 0, 0, 0, 0, 0, 0, 0,
|
- 635751356ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
- if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
|
- if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
|
||||||
@ -102,7 +102,7 @@ Index: libvirt-1.2.14/tests/vircgrouptest.c
|
|||||||
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
|
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
|
||||||
{
|
{
|
||||||
virCgroupPtr cgroup = NULL;
|
virCgroupPtr cgroup = NULL;
|
||||||
@@ -895,9 +809,6 @@ mymain(void)
|
@@ -919,9 +833,6 @@ mymain(void)
|
||||||
if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
|
if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b8e8e6f1fc91eb8694fa21f9c57a736fa4a5af10562e14e4aa2c7e23510c4c07
|
|
||||||
size 28947850
|
|
@ -1,7 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1
|
|
||||||
|
|
||||||
iEYEABECAAYFAlUc9BMACgkQRga4pd6VvB9YcwCeKTfxcm3uFtYaWRJVLLygtIHV
|
|
||||||
cdYAnRTKsdMBJBTSzlFRLvKt1rBGtsVo
|
|
||||||
=LYrN
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libvirt-1.2.15.tar.gz
Normal file
3
libvirt-1.2.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6
|
||||||
|
size 29094868
|
7
libvirt-1.2.15.tar.gz.asc
Normal file
7
libvirt-1.2.15.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1
|
||||||
|
|
||||||
|
iEYEABECAAYFAlVG6IgACgkQRga4pd6VvB8pUACfe0uCYnQVlAKIZz0R4ImEO37J
|
||||||
|
3zgAoImjy0DQTneMNMp3saPUc+NwONYH
|
||||||
|
=kDa/
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -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.14/tools/libvirt-guests.init.in
|
Index: libvirt-1.2.15/tools/libvirt-guests.init.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/tools/libvirt-guests.init.in
|
--- libvirt-1.2.15.orig/tools/libvirt-guests.init.in
|
||||||
+++ libvirt-1.2.14/tools/libvirt-guests.init.in
|
+++ libvirt-1.2.15/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.14/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.14/tools/libvirt-guests.sh.in
|
Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/tools/libvirt-guests.sh.in
|
--- libvirt-1.2.15.orig/tools/libvirt-guests.sh.in
|
||||||
+++ libvirt-1.2.14/tools/libvirt-guests.sh.in
|
+++ libvirt-1.2.15/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/>.
|
||||||
@ -191,10 +191,10 @@ Index: libvirt-1.2.14/tools/libvirt-guests.sh.in
|
|||||||
esac
|
esac
|
||||||
-exit $RETVAL
|
-exit $RETVAL
|
||||||
+rc_exit
|
+rc_exit
|
||||||
Index: libvirt-1.2.14/tools/libvirt-guests.sysconf
|
Index: libvirt-1.2.15/tools/libvirt-guests.sysconf
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/tools/libvirt-guests.sysconf
|
--- libvirt-1.2.15.orig/tools/libvirt-guests.sysconf
|
||||||
+++ libvirt-1.2.14/tools/libvirt-guests.sysconf
|
+++ libvirt-1.2.15/tools/libvirt-guests.sysconf
|
||||||
@@ -1,19 +1,29 @@
|
@@ -1,19 +1,29 @@
|
||||||
+## Path: System/Virtualization/libvirt-guests
|
+## Path: System/Virtualization/libvirt-guests
|
||||||
+
|
+
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/src/cpu/cpu_map.xml
|
Index: libvirt-1.2.15/src/cpu/cpu_map.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/cpu/cpu_map.xml
|
--- libvirt-1.2.15.orig/src/cpu/cpu_map.xml
|
||||||
+++ libvirt-1.2.14/src/cpu/cpu_map.xml
|
+++ libvirt-1.2.15/src/cpu/cpu_map.xml
|
||||||
@@ -668,6 +668,16 @@
|
@@ -668,6 +668,16 @@
|
||||||
<pvr value='0x004d0000'/>
|
<pvr value='0x004d0000'/>
|
||||||
</model>
|
</model>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/configure.ac
|
Index: libvirt-1.2.15/configure.ac
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/configure.ac
|
--- libvirt-1.2.15.orig/configure.ac
|
||||||
+++ libvirt-1.2.14/configure.ac
|
+++ libvirt-1.2.15/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
|
||||||
@ -34,11 +34,11 @@ Index: libvirt-1.2.14/configure.ac
|
|||||||
LIBVIRT_RESULT_NUMACTL
|
LIBVIRT_RESULT_NUMACTL
|
||||||
LIBVIRT_RESULT_OPENWSMAN
|
LIBVIRT_RESULT_OPENWSMAN
|
||||||
LIBVIRT_RESULT_PCIACCESS
|
LIBVIRT_RESULT_PCIACCESS
|
||||||
Index: libvirt-1.2.14/src/Makefile.am
|
Index: libvirt-1.2.15/src/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/Makefile.am
|
--- libvirt-1.2.15.orig/src/Makefile.am
|
||||||
+++ libvirt-1.2.14/src/Makefile.am
|
+++ libvirt-1.2.15/src/Makefile.am
|
||||||
@@ -847,6 +847,10 @@ if WITH_NETCF
|
@@ -848,6 +848,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
|
||||||
@ -49,7 +49,7 @@ Index: libvirt-1.2.14/src/Makefile.am
|
|||||||
if WITH_UDEV
|
if WITH_UDEV
|
||||||
INTERFACE_DRIVER_SOURCES += \
|
INTERFACE_DRIVER_SOURCES += \
|
||||||
interface/interface_backend_udev.c
|
interface/interface_backend_udev.c
|
||||||
@@ -1455,6 +1459,10 @@ if WITH_NETCF
|
@@ -1464,6 +1468,10 @@ 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)
|
||||||
endif WITH_NETCF
|
endif WITH_NETCF
|
||||||
@ -60,11 +60,11 @@ Index: libvirt-1.2.14/src/Makefile.am
|
|||||||
if WITH_UDEV
|
if WITH_UDEV
|
||||||
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
|
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
|
||||||
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
|
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
|
||||||
Index: libvirt-1.2.14/tools/virsh.c
|
Index: libvirt-1.2.15/tools/virsh.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/tools/virsh.c
|
--- libvirt-1.2.15.orig/tools/virsh.c
|
||||||
+++ libvirt-1.2.14/tools/virsh.c
|
+++ libvirt-1.2.15/tools/virsh.c
|
||||||
@@ -3360,6 +3360,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
|
@@ -3327,6 +3327,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");
|
||||||
@ -73,10 +73,10 @@ Index: libvirt-1.2.14/tools/virsh.c
|
|||||||
# elif defined(WITH_UDEV)
|
# elif defined(WITH_UDEV)
|
||||||
vshPrint(ctl, " udev");
|
vshPrint(ctl, " udev");
|
||||||
# endif
|
# endif
|
||||||
Index: libvirt-1.2.14/src/interface/interface_backend_netcf.c
|
Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/interface/interface_backend_netcf.c
|
--- libvirt-1.2.15.orig/src/interface/interface_backend_netcf.c
|
||||||
+++ libvirt-1.2.14/src/interface/interface_backend_netcf.c
|
+++ libvirt-1.2.15/src/interface/interface_backend_netcf.c
|
||||||
@@ -23,7 +23,12 @@
|
@@ -23,7 +23,12 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
@ -160,10 +160,10 @@ Index: libvirt-1.2.14/src/interface/interface_backend_netcf.c
|
|||||||
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
|
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
|
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
|
||||||
Index: libvirt-1.2.14/src/interface/interface_driver.c
|
Index: libvirt-1.2.15/src/interface/interface_driver.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/interface/interface_driver.c
|
--- libvirt-1.2.15.orig/src/interface/interface_driver.c
|
||||||
+++ libvirt-1.2.14/src/interface/interface_driver.c
|
+++ libvirt-1.2.15/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;
|
||||||
@ -181,10 +181,10 @@ Index: libvirt-1.2.14/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.14/m4/virt-netcontrol.m4
|
Index: libvirt-1.2.15/m4/virt-netcontrol.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ libvirt-1.2.14/m4/virt-netcontrol.m4
|
+++ libvirt-1.2.15/m4/virt-netcontrol.m4
|
||||||
@@ -0,0 +1,35 @@
|
@@ -0,0 +1,35 @@
|
||||||
+dnl The libnetcontrol library
|
+dnl The libnetcontrol library
|
||||||
+dnl
|
+dnl
|
||||||
|
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 5 09:35:12 MDT 2015 - jfehlig@suse.com
|
||||||
|
|
||||||
|
- libxl: support virtual sound devices in HVM domains
|
||||||
|
c0d3f608-libxl-soundhw.patch
|
||||||
|
bsc#875216
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 4 09:00:24 MDT 2015 - jfehlig@suse.com
|
||||||
|
|
||||||
|
- Update to libvirt 1.2.15
|
||||||
|
- Implement virDomainAddIOThread and virDomainDelIOThread
|
||||||
|
- libxl: Introduce configuration file for libxl driver
|
||||||
|
- Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event
|
||||||
|
- Many incremental improvements and bug fixes, see
|
||||||
|
http://libvirt.org/news.html
|
||||||
|
- Drop upstream patches da33a1ac-lxc-init-statedir.patch and
|
||||||
|
open-ns-files-readonly.patch
|
||||||
|
- spec file fixups for building --without-driver-modules
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 20 13:19:09 UTC 2015 - cbosdonnat@suse.com
|
Mon Apr 20 13:19:09 UTC 2015 - cbosdonnat@suse.com
|
||||||
|
|
||||||
|
33
libvirt.spec
33
libvirt.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libvirt
|
# spec file for package libvirt
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -245,7 +245,7 @@
|
|||||||
|
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Url: http://libvirt.org/
|
Url: http://libvirt.org/
|
||||||
Version: 1.2.14
|
Version: 1.2.15
|
||||||
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+
|
||||||
@ -449,9 +449,8 @@ Source4: libvirtd-relocation-server.fw
|
|||||||
Source5: polkit-10-virt.rules
|
Source5: polkit-10-virt.rules
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
Patch0: da33a1ac-lxc-init-statedir.patch
|
Patch0: c0d3f608-libxl-soundhw.patch
|
||||||
# Patches pending upstream review
|
# Patches pending upstream review
|
||||||
Patch100: open-ns-files-readonly.patch
|
|
||||||
# Need to go upstream
|
# Need to go upstream
|
||||||
Patch150: xen-pv-cdrom.patch
|
Patch150: xen-pv-cdrom.patch
|
||||||
Patch151: blockcopy-check-dst-identical-device.patch
|
Patch151: blockcopy-check-dst-identical-device.patch
|
||||||
@ -981,7 +980,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch100 -p1
|
|
||||||
%patch150 -p1
|
%patch150 -p1
|
||||||
%patch151 -p1
|
%patch151 -p1
|
||||||
%patch152 -p1
|
%patch152 -p1
|
||||||
@ -1308,6 +1306,11 @@ Any empty package encapsulating requirements for a libvirtd capable
|
|||||||
of managing Xen.
|
of managing Xen.
|
||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
|
%if ! %{with_libxl}
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
||||||
|
%endif
|
||||||
%if ! %{with_sanlock}
|
%if ! %{with_sanlock}
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
|
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
|
||||||
@ -1326,7 +1329,7 @@ install %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/libvirtd
|
|||||||
ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd
|
ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd
|
||||||
%endif
|
%endif
|
||||||
mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
|
mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
|
||||||
rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/libvirtd.conf
|
rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/60-libvirtd.conf
|
||||||
# For other services, use the in-tree scripts
|
# For other services, use the in-tree scripts
|
||||||
%if %{with_systemd}
|
%if %{with_systemd}
|
||||||
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd
|
||||||
@ -1554,8 +1557,6 @@ fi
|
|||||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
|
||||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
|
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
|
||||||
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
|
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
|
||||||
%dir %{_datadir}/libvirt/networks/
|
|
||||||
%{_datadir}/libvirt/networks/default.xml
|
|
||||||
%endif
|
%endif
|
||||||
%if %{with_nwfilter}
|
%if %{with_nwfilter}
|
||||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
|
||||||
@ -1566,8 +1567,6 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
|
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||||
@ -1580,6 +1579,7 @@ fi
|
|||||||
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc
|
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc
|
||||||
%{_datadir}/augeas/lenses/libvirtd_lxc.aug
|
%{_datadir}/augeas/lenses/libvirtd_lxc.aug
|
||||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
|
||||||
|
%attr(0755, root, root) %{_bindir}/virt-lxc-convert
|
||||||
%endif
|
%endif
|
||||||
%if %{with_uml}
|
%if %{with_uml}
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
|
||||||
@ -1587,8 +1587,12 @@ fi
|
|||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
|
||||||
%endif
|
%endif
|
||||||
%if %{with_libxl}
|
%if %{with_libxl}
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
|
||||||
|
%{_datadir}/augeas/lenses/libvirtd_libxl.aug
|
||||||
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
||||||
%endif
|
%endif
|
||||||
%if %{with_storage_disk}
|
%if %{with_storage_disk}
|
||||||
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper
|
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper
|
||||||
@ -1677,8 +1681,6 @@ fi
|
|||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
|
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||||
@ -1725,6 +1727,10 @@ fi
|
|||||||
|
|
||||||
%files daemon-driver-libxl
|
%files daemon-driver-libxl
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
|
||||||
|
%{_datadir}/augeas/lenses/libvirtd_libxl.aug
|
||||||
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
|
||||||
%dir %{_libdir}/%{name}/connection-driver
|
%dir %{_libdir}/%{name}/connection-driver
|
||||||
@ -1862,6 +1868,9 @@ fi
|
|||||||
%if %{with_qemu}
|
%if %{with_qemu}
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/qemu-sanlock.conf
|
%config(noreplace) %{_sysconfdir}/%{name}/qemu-sanlock.conf
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with_libxl}
|
||||||
|
%config(noreplace) %{_sysconfdir}/%{name}/libxl-sanlock.conf
|
||||||
|
%endif
|
||||||
%dir %{_libdir}/%{name}/lock-driver/
|
%dir %{_libdir}/%{name}/lock-driver/
|
||||||
%attr(0755, root, root) %{_libdir}/%{name}/lock-driver/sanlock.so
|
%attr(0755, root, root) %{_libdir}/%{name}/lock-driver/sanlock.so
|
||||||
%dir %{_datadir}/augeas/
|
%dir %{_datadir}/augeas/
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/daemon/libvirtd.conf
|
Index: libvirt-1.2.15/daemon/libvirtd.conf
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/daemon/libvirtd.conf
|
--- libvirt-1.2.15.orig/daemon/libvirtd.conf
|
||||||
+++ libvirt-1.2.14/daemon/libvirtd.conf
|
+++ libvirt-1.2.15/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,10 +13,10 @@ Index: libvirt-1.2.14/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.14/daemon/libvirtd-config.c
|
Index: libvirt-1.2.15/daemon/libvirtd-config.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/daemon/libvirtd-config.c
|
--- libvirt-1.2.15.orig/daemon/libvirtd-config.c
|
||||||
+++ libvirt-1.2.14/daemon/libvirtd-config.c
|
+++ libvirt-1.2.15/daemon/libvirtd-config.c
|
||||||
@@ -242,7 +242,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.14/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.14/daemon/test_libvirtd.aug.in
|
Index: libvirt-1.2.15/daemon/test_libvirtd.aug.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/daemon/test_libvirtd.aug.in
|
--- libvirt-1.2.15.orig/daemon/test_libvirtd.aug.in
|
||||||
+++ libvirt-1.2.14/daemon/test_libvirtd.aug.in
|
+++ libvirt-1.2.15/daemon/test_libvirtd.aug.in
|
||||||
@@ -2,7 +2,7 @@ module Test_libvirtd =
|
@@ -2,7 +2,7 @@ module Test_libvirtd =
|
||||||
::CONFIG::
|
::CONFIG::
|
||||||
|
|
||||||
|
@ -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.14/daemon/libvirtd.sysconf
|
Index: libvirt-1.2.15/daemon/libvirtd.sysconf
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/daemon/libvirtd.sysconf
|
--- libvirt-1.2.15.orig/daemon/libvirtd.sysconf
|
||||||
+++ libvirt-1.2.14/daemon/libvirtd.sysconf
|
+++ libvirt-1.2.15/daemon/libvirtd.sysconf
|
||||||
@@ -1,16 +1,25 @@
|
@@ -1,16 +1,25 @@
|
||||||
+## Path: System/Virtualization/libvirt
|
+## Path: System/Virtualization/libvirt
|
||||||
+
|
+
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
From cc21badc5c30ddeeb89abfa9ecdfbacd512f33c2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
||||||
Date: Thu, 9 Apr 2015 09:22:43 +0200
|
|
||||||
Subject: [PATCH] Open /proc/PID/ns/* read-only to avoid getting permission
|
|
||||||
denied
|
|
||||||
|
|
||||||
lxc-enter-namespace stopped working on recent kernels (at least 3.19+)
|
|
||||||
due to /proc/PID/ns/* file descriptors being opened RW. From outside
|
|
||||||
the namespace these can only be opened RO.
|
|
||||||
---
|
|
||||||
src/util/virprocess.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
|
|
||||||
index ab1e039..7a79970 100644
|
|
||||||
--- a/src/util/virprocess.c
|
|
||||||
+++ b/src/util/virprocess.c
|
|
||||||
@@ -628,7 +628,7 @@ int virProcessGetNamespaces(pid_t pid,
|
|
||||||
ns[i]) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
- if ((fd = open(nsfile, O_RDWR)) >= 0) {
|
|
||||||
+ if ((fd = open(nsfile, O_RDONLY)) >= 0) {
|
|
||||||
if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) {
|
|
||||||
VIR_FORCE_CLOSE(fd);
|
|
||||||
goto cleanup;
|
|
||||||
--
|
|
||||||
2.1.4
|
|
||||||
|
|
@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
|
|||||||
|
|
||||||
See bnc#894956
|
See bnc#894956
|
||||||
|
|
||||||
Index: libvirt-1.2.14/src/util/virarch.c
|
Index: libvirt-1.2.15/src/util/virarch.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/util/virarch.c
|
--- libvirt-1.2.15.orig/src/util/virarch.c
|
||||||
+++ libvirt-1.2.14/src/util/virarch.c
|
+++ libvirt-1.2.15/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")) {
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu
|
Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu
|
--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
|
||||||
+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu
|
+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu
|
||||||
@@ -132,6 +132,9 @@
|
@@ -133,6 +133,9 @@
|
||||||
/sys/bus/ r,
|
/sys/bus/ r,
|
||||||
/sys/class/ r,
|
/sys/class/ r,
|
||||||
|
|
||||||
|
@ -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.14/src/xenconfig/xen_common.c
|
Index: libvirt-1.2.15/src/xenconfig/xen_common.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/xenconfig/xen_common.c
|
--- libvirt-1.2.15.orig/src/xenconfig/xen_common.c
|
||||||
+++ libvirt-1.2.14/src/xenconfig/xen_common.c
|
+++ libvirt-1.2.15/src/xenconfig/xen_common.c
|
||||||
@@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
|
@@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
|
||||||
{
|
{
|
||||||
virConfValuePtr list = virConfGetValue(conf, "pci");
|
virConfValuePtr list = virConfGetValue(conf, "pci");
|
||||||
@ -66,10 +66,10 @@ Index: libvirt-1.2.14/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.14/src/xenconfig/xen_sxpr.c
|
Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c
|
--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
|
||||||
+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c
|
+++ libvirt-1.2.15/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.14/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;
|
||||||
@@ -2006,11 +2009,15 @@ static void
|
@@ -2012,11 +2015,15 @@ static void
|
||||||
xenFormatSxprPCI(virDomainHostdevDefPtr def,
|
xenFormatSxprPCI(virDomainHostdevDefPtr def,
|
||||||
virBufferPtr buf)
|
virBufferPtr buf)
|
||||||
{
|
{
|
||||||
@ -110,7 +110,7 @@ Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -2029,12 +2036,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
|
@@ -2035,12 +2042,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
|
||||||
virBufferPtr buf,
|
virBufferPtr buf,
|
||||||
int detach)
|
int detach)
|
||||||
{
|
{
|
||||||
@ -123,7 +123,7 @@ Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c
|
|||||||
virBufferAddLit(buf, "(pci ");
|
virBufferAddLit(buf, "(pci ");
|
||||||
xenFormatSxprPCI(def, buf);
|
xenFormatSxprPCI(def, buf);
|
||||||
if (detach)
|
if (detach)
|
||||||
@@ -2089,12 +2090,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
|
@@ -2095,12 +2096,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) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/src/qemu/qemu.conf
|
Index: libvirt-1.2.15/src/qemu/qemu.conf
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/qemu/qemu.conf
|
--- libvirt-1.2.15.orig/src/qemu/qemu.conf
|
||||||
+++ libvirt-1.2.14/src/qemu/qemu.conf
|
+++ libvirt-1.2.15/src/qemu/qemu.conf
|
||||||
@@ -201,11 +201,20 @@
|
@@ -201,11 +201,20 @@
|
||||||
# isolation, but it cannot appear in a list of drivers.
|
# isolation, but it cannot appear in a list of drivers.
|
||||||
#
|
#
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/daemon/libvirtd.service.in
|
Index: libvirt-1.2.15/daemon/libvirtd.service.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/daemon/libvirtd.service.in
|
--- libvirt-1.2.15.orig/daemon/libvirtd.service.in
|
||||||
+++ libvirt-1.2.14/daemon/libvirtd.service.in
|
+++ libvirt-1.2.15/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
|
||||||
|
@ -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.14/src/locking/virtlockd.sysconf
|
Index: libvirt-1.2.15/src/locking/virtlockd.sysconf
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/locking/virtlockd.sysconf
|
--- libvirt-1.2.15.orig/src/locking/virtlockd.sysconf
|
||||||
+++ libvirt-1.2.14/src/locking/virtlockd.sysconf
|
+++ libvirt-1.2.15/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.14/src/locking/virtlockd.sysconf
|
|||||||
#
|
#
|
||||||
# Pass extra arguments to virtlockd
|
# Pass extra arguments to virtlockd
|
||||||
#VIRTLOCKD_ARGS=
|
#VIRTLOCKD_ARGS=
|
||||||
Index: libvirt-1.2.14/src/locking/virtlockd.init.in
|
Index: libvirt-1.2.15/src/locking/virtlockd.init.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/locking/virtlockd.init.in
|
--- libvirt-1.2.15.orig/src/locking/virtlockd.init.in
|
||||||
+++ libvirt-1.2.14/src/locking/virtlockd.init.in
|
+++ libvirt-1.2.15/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
|
||||||
#
|
#
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c
|
Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c
|
--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
|
||||||
+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c
|
+++ libvirt-1.2.15/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,
|
||||||
|
Loading…
Reference in New Issue
Block a user