[libvirt] Add patch to fix -kernel boot with latest QEMU
Daniel P. Berrange
berrange at fedoraproject.org
Mon Feb 21 14:34:25 UTC 2011
commit d7239a45b63868b3294ff57941b7af7f29d77c8b
Author: Daniel P. Berrange <berrange at redhat.com>
Date: Mon Feb 21 14:31:23 2011 +0000
Add patch to fix -kernel boot with latest QEMU
libvirt-0.8.8-kernel-boot-index.patch | 27 +++++++++++++++++++++++++++
libvirt.spec | 7 ++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/libvirt-0.8.8-kernel-boot-index.patch b/libvirt-0.8.8-kernel-boot-index.patch
new file mode 100644
index 0000000..afa5de6
--- /dev/null
+++ b/libvirt-0.8.8-kernel-boot-index.patch
@@ -0,0 +1,27 @@
+commit efc2594b4e0cbcdd6947fafeeed41accd5b611e0
+Author: Jim Fehlig <jfehlig at novell.com>
+Date: Thu Feb 17 14:22:55 2011 -0700
+
+ Do not add drive 'boot=on' param when a kernel is specified
+
+ libvirt-tck was failing several domain tests [1] with qemu 0.14, which
+ is now less tolerable of specifying 2 bootroms with the same boot index [2].
+
+ Drop the 'boot=on' param if kernel has been specfied.
+
+ [1] https://www.redhat.com/archives/libvir-list/2011-February/msg00559.html
+ [2] http://lists.nongnu.org/archive/html/qemu-devel/2011-02/msg01892.html
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 371a7ed..0db2843 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -3173,7 +3173,7 @@ qemuBuildCommandLine(virConnectPtr conn,
+ int bootCD = 0, bootFloppy = 0, bootDisk = 0;
+
+ /* If QEMU supports boot=on for -drive param... */
+- if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT) {
++ if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT && !def->os.kernel) {
+ for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ switch (def->os.bootDevs[i]) {
+ case VIR_DOMAIN_BOOT_CDROM:
diff --git a/libvirt.spec b/libvirt.spec
index 7de0c8e..070af28 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -204,10 +204,11 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 0.8.8
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
+Patch1: %{name}-%{version}-kernel-boot-index.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python-devel
@@ -454,6 +455,7 @@ of recent versions of Linux (and other OSes).
%prep
%setup -q
+%patch1 -p1
%build
%if ! %{with_xen}
@@ -973,6 +975,9 @@ fi
%endif
%changelog
+* Mon Feb 21 2011 Daniel P. Berrange <berrange at redhat.com> - 0.8.8-2
+- Fix kernel boot with latest QEMU
+
* Thu Feb 17 2011 Daniel Veillard <veillard at redhat.com> - 0.8.8-1
- expose new API for sysinfo extraction
- cgroup blkio weight support
More information about the scm-commits
mailing list