From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 30 Jul 2010 14:38:48 +0000 (+0200)
Subject: Do not activate boot=on on devices when not using KVM
X-Git-Tag: v0.8.3~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7da872294bd1cfaa9733e1292476221659ab47b;p=thirdparty%2Flibvirt.git

Do not activate boot=on on devices when not using KVM

  Basically the 'boot=on' boot selection device is something present in
KVM but not in upstream QEmu, as a result if we boot a QEmu domain
without KVM acceleration we must disable boot=on ... even if the front
end kvm binary expose that capability in the help page.

* src/qemu/qemu_conf.c: in qemudBuildCommandLine if -no-kvm
  is passed, then deactivate QEMUD_CMD_FLAG_DRIVE_BOOT
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index a79e0d7d84..57bc02fac6 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -3707,9 +3707,17 @@ int qemudBuildCommandLine(virConnectPtr conn,
      * 2. The qemu binary has the -no-kvm flag
      */
     if ((qemuCmdFlags & QEMUD_CMD_FLAG_KVM) &&
-        def->virtType == VIR_DOMAIN_VIRT_QEMU)
+        def->virtType == VIR_DOMAIN_VIRT_QEMU) {
         disableKVM = 1;
 
+        /*
+         * do not use boot=on for drives when not using KVM since this
+         * is not supported at all in upstream QEmu.
+         */
+        if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT)
+            qemuCmdFlags -= QEMUD_CMD_FLAG_DRIVE_BOOT;
+    }
+
     /* Should explicitly enable KVM if
      * 1. Guest domain is 'kvm'
      * 2. The qemu binary has the -enable-kvm flag