From 1f8194b3a18bd3e445465e4415f65416c34b8b56 Mon Sep 17 00:00:00 2001
From: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Date: Tue, 12 Jul 2011 12:32:22 +0300
Subject: [PATCH] KVM: strip boot=on from IDE CDROM drivers
boot=on forces KVM to use an extboot ROM which has shown poor behaviour with
booting from CD images. IDE CDROM emulation (which is forced by default when
booting from CD) does not need boot=on, so we simply omit it.
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
---
lib/hypervisor/hv_kvm.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 94247371d..8f738151c 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -607,10 +607,10 @@ class KVMHypervisor(hv_base.BaseHypervisor):
options = "%s,format=raw" % options
if boot_cdrom:
kvm_cmd.extend(['-boot', 'd'])
- if cdrom_disk_type != constants.HT_DISK_IDE:
- options = '%s,boot=on,if=%s' % (options, constants.HT_DISK_IDE)
- else:
- options = '%s,boot=on' % options
+ # We default to IDE in order for CDROM booting to be usable
+ # Also, there is no need to pass boot=on, as IDE doesn't need
+ # extboot functionality to boot
+ options = '%s,if=%s' % (options, constants.HT_DISK_IDE)
else:
if cdrom_disk_type == constants.HT_DISK_PARAVIRTUAL:
if_val = ',if=virtio'
--
GitLab