[fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, 1.4, 1.5 libvirt.spec, 1.174, 1.175 sources, 1.47, 1.48
Mark McLoughlin
markmc at fedoraproject.org
Mon Sep 14 18:30:46 UTC 2009
Author: markmc
Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16180
Modified Files:
libvirt-0.6.4-svirt-sound.patch libvirt.spec sources
Log Message:
* Mon Sep 14 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.2.gitfac3f4c
- Update to newer snapshot of 0.7.1
- Stop libvirt using untrusted 'info vcpus' PID data (#520864)
- Support relabelling of USB and PCI devices
- Enable multipath storage support
- Restart libvirtd upon RPM upgrade
libvirt-0.6.4-svirt-sound.patch:
qemu_conf.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libvirt-0.6.4-svirt-sound.patch 19 Aug 2009 17:13:01 -0000 1.4
+++ libvirt-0.6.4-svirt-sound.patch 14 Sep 2009 18:30:45 -0000 1.5
@@ -1,4 +1,4 @@
-From 5f8d720b5f1393ee333a5fa8375ffe9ac954d48b Mon Sep 17 00:00:00 2001
+From e2106f6db9beb9f48e9f87f8a1eaba821d1a2296 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 17 Aug 2009 08:32:08 +0100
Subject: [PATCH] Disable sound cards when running sVirt
@@ -12,10 +12,10 @@ Fedora-patch: libvirt-0.6.4-svirt-sound.
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 6b0b404..53186e0 100644
+index f92bcef..f3b4ef0 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
-@@ -1384,6 +1384,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -1510,6 +1510,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
char uuid[VIR_UUID_STRING_BUFLEN];
char domid[50];
const char *cpu = NULL;
@@ -36,7 +36,7 @@ index 6b0b404..53186e0 100644
uname_normalize(&ut);
-@@ -2015,7 +2029,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
+@@ -2181,7 +2195,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
}
/* Add sound hardware */
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- libvirt.spec 6 Sep 2009 13:46:19 -0000 1.174
+++ libvirt.spec 14 Sep 2009 18:30:45 -0000 1.175
@@ -18,6 +18,7 @@
%define with_storage_lvm 0%{!?_without_storage_lvm:1}
%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
%define with_storage_disk 0%{!?_without_storage_disk:1}
+%define with_storage_mpath 0%{!?_without_storage_mpath:1}
%define with_numactl 0%{!?_without_numactl:1}
# default to off - selectively enabled below
@@ -72,12 +73,12 @@
%define with_one 0
%endif
-%define git_snapshot git3ef2e05
+%define git_snapshot gitfac3f4c
Summary: Library providing a simple API virtualization
Name: libvirt
Version: 0.7.1
-Release: 0.1.%{git_snapshot}%{?dist}%{?extra_release}
+Release: 0.2.%{git_snapshot}%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
Source: http://libvirt.org/sources/libvirt-%{version}-%{git_snapshot}.tar.gz
@@ -119,6 +120,11 @@ Requires: glusterfs-client >= 2.0.1
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
+# For image compression
+Requires: gzip
+Requires: bzip2
+Requires: lzop
+Requires: xz
%else
%if %{with_xen}
# From Xen RPMs
@@ -137,6 +143,10 @@ Requires: iscsi-initiator-utils
# For disk driver
Requires: parted
%endif
+%if %{with_storage_mpath}
+# For multipath support
+Requires: device-mapper
+%endif
%if %{with_xen}
BuildRequires: xen-devel
%endif
@@ -192,6 +202,10 @@ BuildRequires: iscsi-initiator-utils
# For disk driver
BuildRequires: parted-devel
%endif
+%if %{with_storage_mpath}
+# For Multipath support
+BuildRequires: device-mapper-devel
+%endif
%if %{with_numactl}
# For QEMU/LXC numa info
BuildRequires: numactl-devel
@@ -341,6 +355,10 @@ of recent versions of Linux (and other O
%define _without_storage_disk --without-storage-disk
%endif
+%if ! %{with_storage_mpath}
+%define _without_storage_mpath --without-storage-mpath
+%endif
+
%if ! %{with_numactl}
%define _without_numactl --without-numactl
%endif
@@ -372,6 +390,7 @@ of recent versions of Linux (and other O
%{?_without_storage_lvm} \
%{?_without_storage_iscsi} \
%{?_without_storage_disk} \
+ %{?_without_storage_mpath} \
%{?_without_numactl} \
%{?_without_capng} \
%{?_without_netcf} \
@@ -460,6 +479,9 @@ fi
%endif
/sbin/chkconfig --add libvirtd
+if [ "$1" -ge "1" ]; then
+ /sbin/service libvirtd condrestart > /dev/null 2>&1
+fi
%endif
%preun
@@ -628,6 +650,13 @@ fi
%endif
%changelog
+* Mon Sep 14 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.2.gitfac3f4c
+- Update to newer snapshot of 0.7.1
+- Stop libvirt using untrusted 'info vcpus' PID data (#520864)
+- Support relabelling of USB and PCI devices
+- Enable multipath storage support
+- Restart libvirtd upon RPM upgrade
+
* Sun Sep 6 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-0.1.gitg3ef2e05
- Update to pre-release git snapshot of 0.7.1
- Drop upstreamed patches
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- sources 6 Sep 2009 13:46:19 -0000 1.47
+++ sources 14 Sep 2009 18:30:45 -0000 1.48
@@ -1 +1 @@
-d47a8065f71e68d60ff020ba9b370801 libvirt-0.7.1-git3ef2e05.tar.gz
+84cb07d98032787f1e2a36776768e297 libvirt-0.7.1-gitfac3f4c.tar.gz
More information about the Fedora-virt-maint
mailing list