[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.8-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 9d1ceb04fbe3f5a6c35ea7de8ec812a46b9e79e0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Mar 7 21:41:25 2011 +0100

    New patch Do-not-add-drive-boot-on-param-when-a-kernel-is-spec.patch
    
    Do not add drive 'boot=on' param when a kernel is specified
    
    Thanks: Jim Fehlig
    Closes: #615013

diff --git a/debian/patches/Do-not-add-drive-boot-on-param-when-a-kernel-is-spec.patch b/debian/patches/Do-not-add-drive-boot-on-param-when-a-kernel-is-spec.patch
new file mode 100644
index 0000000..290266b
--- /dev/null
+++ b/debian/patches/Do-not-add-drive-boot-on-param-when-a-kernel-is-spec.patch
@@ -0,0 +1,29 @@
+From: Jim Fehlig <jfehlig at novell.com>
+Date: Thu, 17 Feb 2011 14:22:55 -0700
+Subject: 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
+---
+ src/qemu/qemu_command.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 05f427c..35e54b4 100644
+--- a/src/qemu/qemu_command.c
++++ b/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/debian/patches/series b/debian/patches/series
index d00825c..2c8db5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 Disable-CHECKSUM-rule.patch
 Debianize-libvirt-guests.patch
 Don-t-pass-empty-arguments-to-dnsmasq.patch
+Do-not-add-drive-boot-on-param-when-a-kernel-is-spec.patch

-- 
Libvirt Debian packaging