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

- Update to libvirt 1.0.5.1 stable release

Browse Source 
- qemu: Fix cgroup handling when setting VCPU BW
  - daemon: fix leak after listing all volumes
  - Fix iohelper usage with streams opened for read
  - util: fix virFileOpenAs return value and resulting error logs
  - iscsi: don't leak portal string when starting a pool
  - don't mention disk controllers in generic controller errors
  - conf: don't crash on a tpm device with no backends
  - qemu: allocate network connections sooner during domain startup
  -  Make detect_scsi_host_caps a function on all architectures
  - Fix release of resources with lockd plugin
  - Fix potential use of undefined variable in remote dispatch code
  - Fix F_DUPFD_CLOEXEC operation args
  - qemu: fix stupid typos in VFIO cgroup setup/teardown
  - network: fix network driver startup for qemu:///session
- Remove patches that are included in the 1.0.5.1 release
  0471637d-cgroups-vcpu-bw.patch, a2214c52-iohelper.patch,
  ca697e90-CVE-2013-1962.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=266
This commit is contained in:
James Fehlig 2013-05-21 18:02:56 +00:00 committed by Git OBS Bridge
parent 4800cebe0e
commit 9decd8f3cc
25 changed files with 132 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
0471637d-cgroups-vcpu-bw.patch
View File

@ -1,63 +0,0 @@
commit 0471637d5628106d058f0eb5516ffa7d5285cc6f
Author: Martin Kletzander <mkletzan@redhat.com>
Date: Thu May 16 14:37:54 2013 +0200
qemu: Fix cgroup handling when setting VCPU BW
Commit 632f78c introduced a regression which causes schedinfo being
unable to set some parameters. When migrating to priv->cgroup there
was missing variable left out and due to passed NULL to underlying
function, the setting failed.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=963592
Index: libvirt-1.0.5/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu_driver.c
+++ libvirt-1.0.5/src/qemu/qemu_driver.c
@@ -7721,7 +7721,6 @@ qemuDomainSetSchedulerParametersFlags(vi
{
virQEMUDriverPtr driver = dom->conn->privateData;
int i;
- virCgroupPtr group = NULL;
virDomainObjPtr vm = NULL;
virDomainDefPtr vmdef = NULL;
unsigned long long value_ul;
@@ -7799,7 +7798,7 @@ qemuDomainSetSchedulerParametersFlags(vi
QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD);
if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) {
- if ((rc = qemuSetVcpusBWLive(vm, group, value_ul, 0)))
+ if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, value_ul, 0)))
goto cleanup;
vm->def->cputune.period = value_ul;
@@ -7813,7 +7812,7 @@ qemuDomainSetSchedulerParametersFlags(vi
QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA);
if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) {
- if ((rc = qemuSetVcpusBWLive(vm, group, 0, value_l)))
+ if ((rc = qemuSetVcpusBWLive(vm, priv->cgroup, 0, value_l)))
goto cleanup;
vm->def->cputune.quota = value_l;
@@ -7827,7 +7826,8 @@ qemuDomainSetSchedulerParametersFlags(vi
QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD);
if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) {
- if ((rc = qemuSetEmulatorBandwidthLive(vm, group, value_ul, 0)))
+ if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup,
+ value_ul, 0)))
goto cleanup;
vm->def->cputune.emulator_period = value_ul;
@@ -7841,7 +7841,8 @@ qemuDomainSetSchedulerParametersFlags(vi
QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA);
if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) {
- if ((rc = qemuSetEmulatorBandwidthLive(vm, group, 0, value_l)))
+ if ((rc = qemuSetEmulatorBandwidthLive(vm, priv->cgroup,
+ 0, value_l)))
goto cleanup;
vm->def->cputune.emulator_quota = value_l;

6
0ced83dc-cgroup-escape-dot.patch
View File

@ -8,10 +8,10 @@ Date: Fri May 3 20:56:50 2013 +0100
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/src/util/vircgroup.c
Index: libvirt-1.0.5.1/src/util/vircgroup.c
===================================================================
--- libvirt-1.0.5.orig/src/util/vircgroup.c
+++ libvirt-1.0.5/src/util/vircgroup.c
--- libvirt-1.0.5.1.orig/src/util/vircgroup.c
+++ libvirt-1.0.5.1/src/util/vircgroup.c
@@ -1106,7 +1106,8 @@ static int virCgroupPartitionNeedsEscapi
if (STRPREFIX(path, "cgroup."))
return 1;

10
486a86eb-cgroups-docs.patch
View File

@ -10,10 +10,10 @@ Date: Fri May 3 16:58:26 2013 +0100
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/docs/cgroups.html.in
Index: libvirt-1.0.5.1/docs/cgroups.html.in
===================================================================
--- /dev/null
+++ libvirt-1.0.5/docs/cgroups.html.in
+++ libvirt-1.0.5.1/docs/cgroups.html.in
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -300,10 +300,10 @@ Index: libvirt-1.0.5/docs/cgroups.html.in
+ </p>
+ </body>
+</html>
Index: libvirt-1.0.5/docs/sitemap.html.in
Index: libvirt-1.0.5.1/docs/sitemap.html.in
===================================================================
--- libvirt-1.0.5.orig/docs/sitemap.html.in
+++ libvirt-1.0.5/docs/sitemap.html.in
--- libvirt-1.0.5.1.orig/docs/sitemap.html.in
+++ libvirt-1.0.5.1/docs/sitemap.html.in
@@ -87,6 +87,10 @@
<span>Ensuring exclusive guest access to disks</span>
</li>

6
95c6cc34-selinux.patch
View File

@ -10,10 +10,10 @@ Date: Wed May 15 16:26:59 2013 +0100
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/src/lxc/lxc_container.c
Index: libvirt-1.0.5.1/src/lxc/lxc_container.c
===================================================================
--- libvirt-1.0.5.orig/src/lxc/lxc_container.c
+++ libvirt-1.0.5/src/lxc/lxc_container.c
--- libvirt-1.0.5.1.orig/src/lxc/lxc_container.c
+++ libvirt-1.0.5.1/src/lxc/lxc_container.c
@@ -701,6 +701,12 @@ static int lxcContainerMountBasicFS(bool
(access(srcpath, R_OK) < 0))
continue;

28
a2214c52-iohelper.patch
View File

@ -1,28 +0,0 @@
commit a2214c5257d3bd7b086ce04aca1648e8ff05ee96
Author: Daniel P. Berrange <berrange@redhat.com>
Date: Fri May 10 14:45:05 2013 +0100
Fix iohelper usage with streams opened for read
In b2878ed860ceceec3cd6481424fed0b543b687cd we added the O_NOCTTY
flag when opening files in the stream code. Unfortunately a later
piece of code was comparing the flags == O_RDONLY, without masking
out the non-access mode flags. This broke the iohelper when used
with streams for read, since it caused us to attach the stream
output pipe to the stream input FD instead of output FD :-(
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/src/fdstream.c
===================================================================
--- libvirt-1.0.5.orig/src/fdstream.c
+++ libvirt-1.0.5/src/fdstream.c
@@ -640,7 +640,7 @@ virFDStreamOpenFileInternal(virStreamPtr
virCommandTransferFD(cmd, fd);
virCommandAddArgFormat(cmd, "%d", fd);
- if (oflags == O_RDONLY) {
+ if ((oflags & O_ACCMODE) == O_RDONLY) {
childfd = fds[1];
fd = fds[0];
virCommandSetOutputFD(cmd, &childfd);

12
bbe97ae9-no-cgroups.patch
View File

@ -21,10 +21,10 @@ Date: Fri May 10 12:05:00 2013 -0600
its callees. Also check for ENOENT in qemuInitCgroup() when determining
if cgroups support is available.
Index: libvirt-1.0.5/src/qemu/qemu_cgroup.c
Index: libvirt-1.0.5.1/src/qemu/qemu_cgroup.c
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu_cgroup.c
+++ libvirt-1.0.5/src/qemu/qemu_cgroup.c
--- libvirt-1.0.5.1.orig/src/qemu/qemu_cgroup.c
+++ libvirt-1.0.5.1/src/qemu/qemu_cgroup.c
@@ -415,7 +415,8 @@ int qemuInitCgroup(virQEMUDriverPtr driv
if (rc != 0) {
if (rc == -ENXIO ||
@ -35,10 +35,10 @@ Index: libvirt-1.0.5/src/qemu/qemu_cgroup.c
VIR_DEBUG("No cgroups present/configured/accessible, ignoring error");
goto done;
}
Index: libvirt-1.0.5/src/util/vircgroup.c
Index: libvirt-1.0.5.1/src/util/vircgroup.c
===================================================================
--- libvirt-1.0.5.orig/src/util/vircgroup.c
+++ libvirt-1.0.5/src/util/vircgroup.c
--- libvirt-1.0.5.1.orig/src/util/vircgroup.c
+++ libvirt-1.0.5.1/src/util/vircgroup.c
@@ -1168,14 +1168,14 @@ static int virCgroupPartitionEscape(char
return 0;
}

12
c2cf5f1c-no-cgroups-fix.patch
View File

@ -14,10 +14,10 @@ Date: Thu May 16 18:47:07 2013 +0100
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/src/qemu/qemu_cgroup.c
Index: libvirt-1.0.5.1/src/qemu/qemu_cgroup.c
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu_cgroup.c
+++ libvirt-1.0.5/src/qemu/qemu_cgroup.c
--- libvirt-1.0.5.1.orig/src/qemu/qemu_cgroup.c
+++ libvirt-1.0.5.1/src/qemu/qemu_cgroup.c
@@ -415,8 +415,7 @@ int qemuInitCgroup(virQEMUDriverPtr driv
if (rc != 0) {
if (rc == -ENXIO ||
@ -28,10 +28,10 @@ Index: libvirt-1.0.5/src/qemu/qemu_cgroup.c
VIR_DEBUG("No cgroups present/configured/accessible, ignoring error");
goto done;
}
Index: libvirt-1.0.5/src/util/vircgroup.c
Index: libvirt-1.0.5.1/src/util/vircgroup.c
===================================================================
--- libvirt-1.0.5.orig/src/util/vircgroup.c
+++ libvirt-1.0.5/src/util/vircgroup.c
--- libvirt-1.0.5.1.orig/src/util/vircgroup.c
+++ libvirt-1.0.5.1/src/util/vircgroup.c
@@ -1110,8 +1110,13 @@ static int virCgroupPartitionNeedsEscapi
path[0] == '.')
return 1;

26
ca697e90-CVE-2013-1962.patch
View File

@ -1,26 +0,0 @@
commit ca697e90d5bd6a6dfb94bfb6d4438bdf9a44b739
Author: Ján Tomko <jtomko@redhat.com>
Date: Fri Apr 12 17:30:56 2013 +0200
daemon: fix leak after listing all volumes
CVE-2013-1962
remoteDispatchStoragePoolListAllVolumes wasn't freeing the pool.
The pool also held a reference to the connection, preventing it from
getting freed and closing the netcf interface driver, which held two
sockets open.
Index: libvirt-1.0.5/daemon/remote.c
===================================================================
--- libvirt-1.0.5.orig/daemon/remote.c
+++ libvirt-1.0.5/daemon/remote.c
@@ -4226,6 +4226,8 @@ cleanup:
virStorageVolFree(vols[i]);
VIR_FREE(vols);
}
+ if (pool)
+ virStoragePoolFree(pool);
return rv;
}

8
f493d83f-cgroup-swap-control.patch
View File

@ -12,11 +12,11 @@ Date: Thu May 9 13:53:39 2013 +0100
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Index: libvirt-1.0.5/src/qemu/qemu_driver.c
Index: libvirt-1.0.5.1/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu_driver.c
+++ libvirt-1.0.5/src/qemu/qemu_driver.c
@@ -7351,9 +7351,12 @@ qemuDomainGetMemoryParameters(virDomainP
--- libvirt-1.0.5.1.orig/src/qemu/qemu_driver.c
+++ libvirt-1.0.5.1/src/qemu/qemu_driver.c
@@ -7352,9 +7352,12 @@ qemuDomainGetMemoryParameters(virDomainP
case 2: /* fill swap hard limit here */
rc = virCgroupGetMemSwapHardLimit(priv->cgroup, &val);
if (rc != 0) {

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

@ -8,10 +8,10 @@ uses the 'device_configure' RPC.
This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools.
Index: libvirt-1.0.5/src/xen/xend_internal.c
Index: libvirt-1.0.5.1/src/xen/xend_internal.c
===================================================================
--- libvirt-1.0.5.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5/src/xen/xend_internal.c
--- libvirt-1.0.5.1.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5.1/src/xen/xend_internal.c
@@ -2473,6 +2473,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];

30
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.5/examples/apparmor/Makefile.am
Index: libvirt-1.0.5.1/examples/apparmor/Makefile.am
===================================================================
--- libvirt-1.0.5.orig/examples/apparmor/Makefile.am
+++ libvirt-1.0.5/examples/apparmor/Makefile.am
--- libvirt-1.0.5.1.orig/examples/apparmor/Makefile.am
+++ libvirt-1.0.5.1/examples/apparmor/Makefile.am
@@ -1,8 +1,45 @@
## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software
@ -53,10 +53,10 @@ Index: libvirt-1.0.5/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
Index: libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
+++ libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include <tunables/global>
@ -98,9 +98,9 @@ Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
Index: libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
--- libvirt-1.0.5.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
--- libvirt-1.0.5.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@ -141,9 +141,9 @@ Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd
Index: libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-1.0.5.orig/examples/apparmor/usr.sbin.libvirtd
--- libvirt-1.0.5.1.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@ -198,10 +198,10 @@ Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd.in
Index: libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
+++ libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd.in
+++ libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,58 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include <tunables/global>
@ -261,9 +261,9 @@ Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
Index: libvirt-1.0.5/examples/apparmor/libvirt-qemu
Index: libvirt-1.0.5.1/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-1.0.5.orig/examples/apparmor/libvirt-qemu
--- libvirt-1.0.5.1.orig/examples/apparmor/libvirt-qemu
+++ /dev/null
@@ -1,129 +0,0 @@
-# Last Modified: Fri Mar 9 14:43:22 2012
@ -395,10 +395,10 @@ Index: libvirt-1.0.5/examples/apparmor/libvirt-qemu
-
- /usr/libexec/qemu-bridge-helper rmix,
- }
Index: libvirt-1.0.5/examples/apparmor/libvirt-qemu.in
Index: libvirt-1.0.5.1/examples/apparmor/libvirt-qemu.in
===================================================================
--- /dev/null
+++ libvirt-1.0.5/examples/apparmor/libvirt-qemu.in
+++ libvirt-1.0.5.1/examples/apparmor/libvirt-qemu.in
@@ -0,0 +1,132 @@
+# Last Modified: Fri Mar 9 14:43:22 2012
+

3
libvirt-1.0.5.1.tar.bz2 Normal file
View File

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

3
libvirt-1.0.5.tar.bz2
View File

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

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

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.0.5/tools/libvirt-guests.init.in
Index: libvirt-1.0.5.1/tools/libvirt-guests.init.in
===================================================================
--- libvirt-1.0.5.orig/tools/libvirt-guests.init.in
+++ libvirt-1.0.5/tools/libvirt-guests.init.in
--- libvirt-1.0.5.1.orig/tools/libvirt-guests.init.in
+++ libvirt-1.0.5.1/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@ -28,10 +28,10 @@ Index: libvirt-1.0.5/tools/libvirt-guests.init.in
### END INIT INFO
# the following is chkconfig init header
Index: libvirt-1.0.5/tools/libvirt-guests.sh.in
Index: libvirt-1.0.5.1/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-1.0.5.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.0.5/tools/libvirt-guests.sh.in
--- libvirt-1.0.5.1.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.0.5.1/tools/libvirt-guests.sh.in
@@ -1,13 +1,12 @@
#!/bin/sh
@ -188,10 +188,10 @@ Index: libvirt-1.0.5/tools/libvirt-guests.sh.in
esac
-exit $RETVAL
+rc_exit
Index: libvirt-1.0.5/tools/libvirt-guests.sysconf
Index: libvirt-1.0.5.1/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-1.0.5.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.0.5/tools/libvirt-guests.sysconf
--- libvirt-1.0.5.1.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.0.5.1/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+

34
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.5/configure.ac
Index: libvirt-1.0.5.1/configure.ac
===================================================================
--- libvirt-1.0.5.orig/configure.ac
+++ libvirt-1.0.5/configure.ac
--- libvirt-1.0.5.1.orig/configure.ac
+++ libvirt-1.0.5.1/configure.ac
@@ -159,6 +159,7 @@ LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_HAL
@ -34,10 +34,10 @@ Index: libvirt-1.0.5/configure.ac
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.0.5/src/Makefile.am
Index: libvirt-1.0.5.1/src/Makefile.am
===================================================================
--- libvirt-1.0.5.orig/src/Makefile.am
+++ libvirt-1.0.5/src/Makefile.am
--- libvirt-1.0.5.1.orig/src/Makefile.am
+++ libvirt-1.0.5.1/src/Makefile.am
@@ -715,6 +715,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
@ -66,10 +66,10 @@ Index: libvirt-1.0.5/src/Makefile.am
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
Index: libvirt-1.0.5/tools/virsh.c
Index: libvirt-1.0.5.1/tools/virsh.c
===================================================================
--- libvirt-1.0.5.orig/tools/virsh.c
+++ libvirt-1.0.5/tools/virsh.c
--- libvirt-1.0.5.1.orig/tools/virsh.c
+++ libvirt-1.0.5.1/tools/virsh.c
@@ -2888,6 +2888,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
@ -79,10 +79,10 @@ Index: libvirt-1.0.5/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
Index: libvirt-1.0.5/src/interface/interface_backend_netcf.c
Index: libvirt-1.0.5.1/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-1.0.5.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.0.5/src/interface/interface_backend_netcf.c
--- libvirt-1.0.5.1.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.0.5.1/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
@ -146,10 +146,10 @@ Index: libvirt-1.0.5/src/interface/interface_backend_netcf.c
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
Index: libvirt-1.0.5/src/interface/interface_driver.c
Index: libvirt-1.0.5.1/src/interface/interface_driver.c
===================================================================
--- libvirt-1.0.5.orig/src/interface/interface_driver.c
+++ libvirt-1.0.5/src/interface/interface_driver.c
--- libvirt-1.0.5.1.orig/src/interface/interface_driver.c
+++ libvirt-1.0.5.1/src/interface/interface_driver.c
@@ -28,8 +28,15 @@ interfaceRegister(void) {
if (netcfIfaceRegister() == 0)
return 0;
@ -167,10 +167,10 @@ Index: libvirt-1.0.5/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
Index: libvirt-1.0.5/m4/virt-netcontrol.m4
Index: libvirt-1.0.5.1/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
+++ libvirt-1.0.5/m4/virt-netcontrol.m4
+++ libvirt-1.0.5.1/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl

22
libvirt.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue May 21 08:32:02 MDT 2013 - jfehlig@suse.com
- Update to libvirt 1.0.5.1 stable release
- qemu: Fix cgroup handling when setting VCPU BW
- daemon: fix leak after listing all volumes
- Fix iohelper usage with streams opened for read
- util: fix virFileOpenAs return value and resulting error logs
- iscsi: don't leak portal string when starting a pool
- don't mention disk controllers in generic controller errors
- conf: don't crash on a tpm device with no backends
- qemu: allocate network connections sooner during domain startup
- Make detect_scsi_host_caps a function on all architectures
- Fix release of resources with lockd plugin
- Fix potential use of undefined variable in remote dispatch code
- Fix F_DUPFD_CLOEXEC operation args
- qemu: fix stupid typos in VFIO cgroup setup/teardown
- network: fix network driver startup for qemu:///session
- Remove patches that are included in the 1.0.5.1 release
0471637d-cgroups-vcpu-bw.patch, a2214c52-iohelper.patch,
ca697e90-CVE-2013-1962.patch
-------------------------------------------------------------------
Mon May 20 14:41:16 MDT 2013 - jfehlig@suse.com

12
libvirt.spec
View File

@ -343,7 +343,7 @@ BuildRequires: libblkid-devel >= 2.17
Name: libvirt
Url: http://libvirt.org/
Version: 1.0.5
Version: 1.0.5.1
Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+
@ -427,11 +427,8 @@ Patch0: f493d83f-cgroup-swap-control.patch
Patch1: 486a86eb-cgroups-docs.patch
Patch2: 0ced83dc-cgroup-escape-dot.patch
Patch3: bbe97ae9-no-cgroups.patch
Patch4: 0471637d-cgroups-vcpu-bw.patch
Patch5: c2cf5f1c-no-cgroups-fix.patch
Patch6: a2214c52-iohelper.patch
Patch7: ca697e90-CVE-2013-1962.patch
Patch8: 95c6cc34-selinux.patch
Patch4: c2cf5f1c-no-cgroups-fix.patch
Patch5: 95c6cc34-selinux.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@ -578,9 +575,6 @@ Authors:
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch100 -p1
%patch101
%patch102 -p1

12
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.5/daemon/libvirtd.conf
Index: libvirt-1.0.5.1/daemon/libvirtd.conf
===================================================================
--- libvirt-1.0.5.orig/daemon/libvirtd.conf
+++ libvirt-1.0.5/daemon/libvirtd.conf
--- libvirt-1.0.5.1.orig/daemon/libvirtd.conf
+++ libvirt-1.0.5.1/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -13,10 +13,10 @@ Index: libvirt-1.0.5/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-1.0.5/daemon/libvirtd-config.c
Index: libvirt-1.0.5.1/daemon/libvirtd-config.c
===================================================================
--- libvirt-1.0.5.orig/daemon/libvirtd-config.c
+++ libvirt-1.0.5/daemon/libvirtd-config.c
--- libvirt-1.0.5.1.orig/daemon/libvirtd-config.c
+++ libvirt-1.0.5.1/daemon/libvirtd-config.c
@@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}

6
libvirtd-init-script.patch
View File

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

6
relax-qemu-usergroup-check.patch
View File

@ -7,10 +7,10 @@ drivers as loadable modules instead of built-in to the
daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration.
Index: libvirt-1.0.5/src/qemu/qemu_conf.c
Index: libvirt-1.0.5.1/src/qemu/qemu_conf.c
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu_conf.c
+++ libvirt-1.0.5/src/qemu/qemu_conf.c
--- libvirt-1.0.5.1.orig/src/qemu/qemu_conf.c
+++ libvirt-1.0.5.1/src/qemu/qemu_conf.c
@@ -435,15 +435,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD
p = virConfGetValue(conf, "user");

12
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 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-1.0.5/src/xenxs/xen_sxpr.c
Index: libvirt-1.0.5.1/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-1.0.5.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5/src/xenxs/xen_sxpr.c
--- libvirt-1.0.5.1.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5.1/src/xenxs/xen_sxpr.c
@@ -1035,6 +1035,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@ -78,10 +78,10 @@ Index: libvirt-1.0.5/src/xenxs/xen_sxpr.c
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
Index: libvirt-1.0.5/src/xenxs/xen_xm.c
Index: libvirt-1.0.5.1/src/xenxs/xen_xm.c
===================================================================
--- libvirt-1.0.5.orig/src/xenxs/xen_xm.c
+++ libvirt-1.0.5/src/xenxs/xen_xm.c
--- libvirt-1.0.5.1.orig/src/xenxs/xen_xm.c
+++ libvirt-1.0.5.1/src/xenxs/xen_xm.c
@@ -815,6 +815,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;

6
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.5/src/qemu/qemu.conf
Index: libvirt-1.0.5.1/src/qemu/qemu.conf
===================================================================
--- libvirt-1.0.5.orig/src/qemu/qemu.conf
+++ libvirt-1.0.5/src/qemu/qemu.conf
--- libvirt-1.0.5.1.orig/src/qemu/qemu.conf
+++ libvirt-1.0.5.1/src/qemu/qemu.conf
@@ -169,7 +169,16 @@
# a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers.

12
virtlockd-init-script.patch
View File

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

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

@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
Index: libvirt-1.0.5/src/xen/xend_internal.c
Index: libvirt-1.0.5.1/src/xen/xend_internal.c
===================================================================
--- libvirt-1.0.5.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5/src/xen/xend_internal.c
--- libvirt-1.0.5.1.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5.1/src/xen/xend_internal.c
@@ -60,8 +60,8 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.5/src/xenxs/xen_sxpr.c
Index: libvirt-1.0.5.1/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-1.0.5.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5/src/xenxs/xen_sxpr.c
--- libvirt-1.0.5.1.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5.1/src/xenxs/xen_sxpr.c
@@ -341,7 +341,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,