Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Mark McLoughlin
|
e2e196d813 | ||
|
Cole Robinson
|
a5a2a38a5e | ||
|
Mark McLoughlin
|
30f098460c | ||
|
Cole Robinson
|
7017c99a1e | ||
|
Mark McLoughlin
|
1c41ce6f30 | ||
|
Daniel P. Berrange
|
c6db79d97f | ||
|
Daniel Veillard
|
7b7f8cc27f | ||
|
Mark McLoughlin
|
a9cc41b082 | ||
|
Jesse Keating
|
ce1593f88f |
@@ -6,4 +6,3 @@ libvirt-*.tar.gz
|
||||
libvirt-0.6.0.tar.gz
|
||||
libvirt-0.6.1.tar.gz
|
||||
libvirt-0.6.2.tar.gz
|
||||
libvirt-0.6.3.tar.gz
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@ Daniel
|
||||
diff -r be7993675e07 src/qemu_conf.c
|
||||
--- a/src/qemu_conf.c Thu Apr 30 14:49:27 2009 +0100
|
||||
+++ b/src/qemu_conf.c Thu Apr 30 15:08:45 2009 +0100
|
||||
@@ -473,16 +473,13 @@ int qemudExtractVersionInfo(const char *
|
||||
@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *
|
||||
|
||||
/*
|
||||
* Handling of -incoming arg with varying features
|
||||
@@ -30,7 +30,7 @@ diff -r be7993675e07 src/qemu_conf.c
|
||||
*/
|
||||
if (kvm_version >= 79) {
|
||||
flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
|
||||
@@ -490,6 +487,9 @@ int qemudExtractVersionInfo(const char *
|
||||
@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *
|
||||
flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
|
||||
} else if (kvm_version > 0) {
|
||||
flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
|
||||
@@ -0,0 +1,26 @@
|
||||
From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
|
||||
From: Mark McLoughlin <markmc@redhat.com>
|
||||
Date: Thu, 16 Apr 2009 11:23:55 +0100
|
||||
Subject: [PATCH 1/3] qemu -drive takes format= not fmt=
|
||||
|
||||
Seems like a simple typo - it has been "format=" since the flag
|
||||
was introduced, but we added it as "fmt=".
|
||||
|
||||
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
||||
---
|
||||
src/qemu_conf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
|
||||
index f36c927..6f9e610 100644
|
||||
--- a/src/qemu_conf.c
|
||||
+++ b/src/qemu_conf.c
|
||||
@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
|
||||
disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
|
||||
virBufferAddLit(&opt, ",boot=on");
|
||||
if (disk->driverType)
|
||||
- virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
|
||||
+ virBufferVSprintf(&opt, ",format=%s", disk->driverType);
|
||||
|
||||
if (disk->cachemode) {
|
||||
const char *mode =
|
||||
@@ -12,7 +12,7 @@
|
||||
+ getuid() == 0) {
|
||||
+ static int soundWarned = 0;
|
||||
+ skipSound = 1;
|
||||
+ if (def->nsounds &&
|
||||
+ if (vm->def->nsounds &&
|
||||
+ !soundWarned) {
|
||||
+ soundWarned = 1;
|
||||
+ VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
|
||||
@@ -25,8 +25,8 @@
|
||||
}
|
||||
|
||||
/* Add sound hardware */
|
||||
- if (def->nsounds) {
|
||||
+ if (def->nsounds &&
|
||||
- if (vm->def->nsounds) {
|
||||
+ if (vm->def->nsounds &&
|
||||
+ !skipSound) {
|
||||
int size = 100;
|
||||
char *modstr;
|
||||
@@ -1,48 +0,0 @@
|
||||
From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Veillard <veillard@redhat.com>
|
||||
Date: Tue, 12 May 2009 15:31:22 +0000
|
||||
Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up
|
||||
without an IP address, patch by Ludwig Nussel
|
||||
Daniel
|
||||
|
||||
---
|
||||
src/network_driver.c | 9 +++------
|
||||
1 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/network_driver.c b/src/network_driver.c
|
||||
index a17a769..a163b15 100644
|
||||
--- a/src/network_driver.c
|
||||
+++ b/src/network_driver.c
|
||||
@@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
|
||||
goto err_delbr;
|
||||
}
|
||||
|
||||
- if (network->def->ipAddress &&
|
||||
- (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
|
||||
+ if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
|
||||
virReportSystemError(conn, err,
|
||||
_("failed to bring the bridge '%s' up"),
|
||||
network->def->bridge);
|
||||
@@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
|
||||
networkRemoveIptablesRules(driver, network);
|
||||
|
||||
err_delbr1:
|
||||
- if (network->def->ipAddress &&
|
||||
- (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
|
||||
+ if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
|
||||
char ebuf[1024];
|
||||
networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
|
||||
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
|
||||
@@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn,
|
||||
networkRemoveIptablesRules(driver, network);
|
||||
|
||||
char ebuf[1024];
|
||||
- if (network->def->ipAddress &&
|
||||
- (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
|
||||
+ if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
|
||||
networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
|
||||
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
|
||||
}
|
||||
--
|
||||
1.6.0.6
|
||||
|
||||
+44
-57
@@ -1,14 +1,26 @@
|
||||
# -*- rpm-spec -*-
|
||||
|
||||
%define with_xen 0%{!?_without_xen:1}
|
||||
%define with_xen_proxy 0%{!?_without_xen_proxy:1}
|
||||
%define with_qemu 0%{!?_without_qemu:1}
|
||||
%define with_openvz 0%{!?_without_openvz:1}
|
||||
%define with_lxc 0%{!?_without_lxc:1}
|
||||
%define with_sasl 0%{!?_without_sasl:1}
|
||||
%define with_avahi 0%{!?_without_avahi:1}
|
||||
%define with_polkit 0%{!?_without_polkit:0}
|
||||
%define with_python 0%{!?_without_python:1}
|
||||
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
||||
%define with_uml 0%{!?_without_uml:1}
|
||||
%define with_network 0%{!?_without_network:1}
|
||||
|
||||
%define with_xen 0%{!?_without_xen:1}
|
||||
%define with_xen_proxy 0%{!?_without_xen_proxy:1}
|
||||
%define with_qemu 0%{!?_without_qemu:1}
|
||||
%define with_openvz 0%{!?_without_openvz:1}
|
||||
%define with_lxc 0%{!?_without_lxc:1}
|
||||
%define with_vbox 0%{!?_without_vbox:1}
|
||||
%define with_sasl 0%{!?_without_sasl:1}
|
||||
%define with_avahi 0%{!?_without_avahi:1}
|
||||
%define with_polkit 0%{!?_without_polkit:1}
|
||||
%define with_polkit 0%{!?_without_polkit:0}
|
||||
%define with_python 0%{!?_without_python:1}
|
||||
%define with_libvirtd 0%{!?_without_libvirtd:1}
|
||||
%define with_uml 0%{!?_without_uml:1}
|
||||
@@ -48,45 +60,40 @@
|
||||
%define with_rhel5 0
|
||||
%else
|
||||
%define with_rhel5 1
|
||||
%define with_polkit 0
|
||||
%endif
|
||||
|
||||
|
||||
Summary: Library providing a simple API virtualization
|
||||
Name: libvirt
|
||||
Version: 0.6.3
|
||||
Release: 11%{?dist}%{?extra_release}
|
||||
Version: 0.6.2
|
||||
Release: 9%{?dist}%{?extra_release}
|
||||
License: LGPLv2+
|
||||
Group: Development/Libraries
|
||||
Source: libvirt-%{version}.tar.gz
|
||||
|
||||
# Patches cherry-picked from upstream
|
||||
|
||||
# Handle shared/readonly image labelling (bz 493692)
|
||||
Patch1: libvirt-0.6.3-shared-readonly-label.patch
|
||||
# Handle <hostdev managed='yes'> correctly (bz 499386)
|
||||
Patch0: libvirt-0.6.2-qemu-drive-format.patch
|
||||
# Fix shared/readonly disk labelling
|
||||
Patch1: libvirt-0.6.2-shared-readonly-label.patch
|
||||
# Fix <hostdev managed='yes'>
|
||||
Patch2: libvirt-0.6.3-hostdev-managed.patch
|
||||
# Refresh qemu caps when getCapabilities is called (bz 460649)
|
||||
Patch3: libvirt-0.6.3-refresh-qemu-caps.patch
|
||||
# Enable migration with qemu 0.10 Enable (bz 499704)
|
||||
Patch4: libvirt-0.6.3-enable-qemu-0-10-migration.patch
|
||||
# Enable migration with qemu 0.10
|
||||
Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch
|
||||
# Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569)
|
||||
Patch5: libvirt-0.6.2-fix-nosource-label.patch
|
||||
# Fix qemu argv detection with latest qemu (bz 501923)
|
||||
Patch6: libvirt-0.6.3-fix-qemu-argv-detection-with-kvm-85.patch
|
||||
Patch6: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch
|
||||
# Fix XML attribute escaping (bz 499791)
|
||||
Patch7: libvirt-0.6.3-xml-attribute-escaping.patch
|
||||
Patch7: libvirt-0.6.2-xml-attribute-escaping.patch
|
||||
# Fix serious event handling issues causing guests to be destroyed (bz 499698)
|
||||
Patch8: libvirt-0.6.3-event-handling-1.patch
|
||||
Patch9: libvirt-0.6.3-event-handling-2.patch
|
||||
# Bring up the bridge, even if it doesn't have an IP address (bz 501912)
|
||||
Patch10: libvirt-0.6.3-bring-up-ipless-bridge.patch
|
||||
Patch8: libvirt-0.6.2-event-handling-1.patch
|
||||
Patch9: libvirt-0.6.2-event-handling-2.patch
|
||||
|
||||
# Patches not for upstream.
|
||||
|
||||
# Temporary hack till PulseAudio autostart problems are sorted
|
||||
# out when SELinux enforcing (bz 486112)
|
||||
Patch200: libvirt-0.6.3-svirt-sound.patch
|
||||
# Not for upstream. Temporary hack till PulseAudio autostart
|
||||
# problems are sorted out when SELinux enforcing
|
||||
Patch200: libvirt-0.6.2-svirt-sound.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
URL: http://libvirt.org/
|
||||
@@ -236,6 +243,8 @@ of recent versions of Linux (and other OSes).
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
@@ -245,7 +254,6 @@ of recent versions of Linux (and other OSes).
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
%patch200 -p0
|
||||
|
||||
@@ -269,10 +277,6 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
|
||||
%define _without_lxc --without-lxc
|
||||
%endif
|
||||
|
||||
%if ! %{with_vbox}
|
||||
%define _without_vbox --without-vbox
|
||||
%endif
|
||||
|
||||
%if ! %{with_sasl}
|
||||
%define _without_sasl --without-sasl
|
||||
%endif
|
||||
@@ -329,7 +333,6 @@ iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
|
||||
%{?_without_qemu} \
|
||||
%{?_without_openvz} \
|
||||
%{?_without_lxc} \
|
||||
%{?_without_vbox} \
|
||||
%{?_without_sasl} \
|
||||
%{?_without_avahi} \
|
||||
%{?_without_polkit} \
|
||||
@@ -364,7 +367,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
|
||||
# Default dir for disk images defined in SELinux policy
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
|
||||
# Default dir for kernel+initrd images defined in SELinux policy
|
||||
# Default dir for kernel+initrd images defnied in SELinux policy
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
|
||||
# used for virDomainMemoryPeek
|
||||
install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt/
|
||||
@@ -439,10 +442,8 @@ fi
|
||||
%defattr(-, root, root)
|
||||
|
||||
%doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
|
||||
%{_mandir}/man1/virsh.1*
|
||||
%{_mandir}/man1/virt-xml-validate.1*
|
||||
%doc %{_mandir}/man1/virsh.1*
|
||||
%{_bindir}/virsh
|
||||
%{_bindir}/virt-xml-validate
|
||||
%{_libdir}/lib*.so.*
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
|
||||
|
||||
@@ -576,44 +577,30 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon May 25 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-11.fc12
|
||||
- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
|
||||
|
||||
* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-10.fc12
|
||||
* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-9.fc11
|
||||
- Fix qemu argv detection with latest qemu (bug #501923)
|
||||
- Fix XML attribute escaping (bug #499791)
|
||||
- Fix serious event handling issues causing guests to be destroyed (bug #499698)
|
||||
|
||||
* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-9.fc12
|
||||
- Fix qemu argv detection with latest qemu (bug #501923)
|
||||
|
||||
* Sun May 10 2009 Cole Robinson <crobinso@redhat.com> - 0.6.2-8.fc12
|
||||
* Sun May 10 2009 Cole Robinson <crobinso@redhat.com> - 0.6.2-8.fc11
|
||||
- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
|
||||
|
||||
* Thu May 7 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-7.fc12
|
||||
* Thu May 7 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-7.fc11
|
||||
- Enable migration for qemu 0.10 (bug #499704)
|
||||
|
||||
* Wed May 6 2009 Cole Robinson <crobinso@redhat.com> - 0.6.3-6.fc12
|
||||
* Wed May 6 2009 Cole Robinson <crobinso@redhat.com> - 0.6.2-6.fc11
|
||||
- Refresh qemu caps when getCapabilities is called (bug #460649)
|
||||
|
||||
* Wed May 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-5.fc12
|
||||
* Wed May 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-5.fc11
|
||||
- Fix handling of <hostdev managed='yes'> (bug #499386)
|
||||
|
||||
* Tue May 5 2009 Daniel Berrange <berrange@redhat.com> - 0.6.3-4.fc12
|
||||
- Fix readonly/shared disk image labelling (rhbz #493692)
|
||||
* Tue May 5 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.2-4.fc11
|
||||
- Fix labelling of shared/readonly disks (rhbz #493692)
|
||||
|
||||
* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-3.fc12
|
||||
- was also missing /usr/share/gtk-doc/html/libvirt in -devel
|
||||
* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.2-3.fc11
|
||||
- Fix missing directories in spec (#496945 and gtk-doc)
|
||||
|
||||
* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-2.fc12
|
||||
- fix packaging bug #496945 libvirt should own /var/cache/libvirt
|
||||
|
||||
* Fri Apr 24 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-1.fc12
|
||||
- release of 0.6.3
|
||||
- VirtualBox driver
|
||||
- new virt-xml-validate command
|
||||
- assorted bug fixes
|
||||
|
||||
* Thu Apr 16 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-2.fc12
|
||||
* Thu Apr 16 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-2.fc11
|
||||
- Fix qemu drive format specification (#496092)
|
||||
|
||||
* Fri Apr 3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.2-1.fc11
|
||||
|
||||
Reference in New Issue
Block a user