From 2b031a9daaacf0b7b4a250ce91e872ebcb8d4c9bb4d6e95e4de0f9296c3d9805 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Fri, 18 Feb 2011 03:40:19 +0000
Subject: [PATCH] - Do not add drive 'boot=on' param when a kernel is specified
   efc2594b-boot-param.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=99
---
 efc2594b-boot-param.patch | 27 +++++++++++++++++++++++++++
 libvirt.changes           |  6 ++++++
 libvirt.spec              |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 efc2594b-boot-param.patch

diff --git a/efc2594b-boot-param.patch b/efc2594b-boot-param.patch
new file mode 100644
index 0000000..2644da0
--- /dev/null
+++ b/efc2594b-boot-param.patch
@@ -0,0 +1,27 @@
+commit efc2594b4e0cbcdd6947fafeeed41accd5b611e0
+Author: Jim Fehlig <jfehlig@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
+
+Index: libvirt-0.8.8/src/qemu/qemu_command.c
+===================================================================
+--- libvirt-0.8.8.orig/src/qemu/qemu_command.c
++++ libvirt-0.8.8/src/qemu/qemu_command.c
+@@ -3116,7 +3116,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.changes b/libvirt.changes
index 2b12474..4eca534 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 20:39:22 MST 2011 - jfehlig@novell.com
+
+- Do not add drive 'boot=on' param when a kernel is specified
+  efc2594b-boot-param.patch
+
 -------------------------------------------------------------------
 Thu Feb 17 10:26:11 MST 2011 - jfehlig@novell.com
 
diff --git a/libvirt.spec b/libvirt.spec
index 79ccf12..9b47268 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -169,6 +169,7 @@ Recommends:     PolicyKit >= 0.6
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        libvirtd.init
 # Upstream patches
+Patch0:         efc2594b-boot-param.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch102:       clone.patch
@@ -281,6 +282,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 %patch100 -p1
 %patch102
 %patch103 -p1