This adds a global switch 'use_bootindex' which will make autotest
use bootindex instead of boot=on when it sees image_boot=yes.  Needed
when testing upstream qemu as boot=on isn't supported there.

Unfortunaly there is no easy way to figure whenever qemu supports
boot=on or not, thus we need the inconvinient manual switch here.

Signed-off-by: Gerd Hoffmann <[email protected]>
---
 client/virt/kvm_vm.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/client/virt/kvm_vm.py b/client/virt/kvm_vm.py
index d346876..bf243b4 100644
--- a/client/virt/kvm_vm.py
+++ b/client/virt/kvm_vm.py
@@ -442,6 +442,10 @@ class VM(virt_vm.BaseVM):
                       lun=None):
             name = None
             dev = ""
+            if self.params.get("use_bootindex") in ['yes', 'on', True]:
+                if boot in ['yes', 'on', True]:
+                    bootindex = 1
+                boot = "unused"
             if format == "ahci":
                 name = "ahci%s" % index
                 dev += " -device ide-drive,bus=ahci.%s,drive=%s" % (index, 
name)
-- 
1.7.1

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to