[KVM-AUTOTEST PATCH v2 1/4] KVM test: support -kernel and -append command line options

Michael Goldish
2010-06-08T21:50:04Z

client/tests/kvm/kvm_vm.py | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index 94bacdf..f3c05f3 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -268,6 +268,12 @@ class VM:
def add_pcidevice(help, host):
return " -pcidevice host=%s" % host

+ def add_kernel(help, filename):
+ return " -kernel %s" % filename
+
+ def add_kernel_cmdline(help, cmdline):
+ return " -append %s" % cmdline
+
# End of command line option wrappers

if name is None: name = self.name
@@ -360,6 +366,15 @@ class VM:
tftp = kvm_utils.get_path(root_dir, tftp)
qemu_cmd += add_tftp(help, tftp)

+ kernel = params.get("kernel")
+ if kernel:
+ kernel = kvm_utils.get_path(root_dir, kernel)
+ qemu_cmd += add_kernel(help, kernel)
+
+ kernel_cmdline = params.get("kernel_cmdline")
+ if kernel_cmdline:
+ qemu_cmd += add_kernel_cmdline(help, kernel_cmdline)
+
for redir_name in kvm_utils.get_sub_dict_names(params, "redirs"):
redir_params = kvm_utils.get_sub_dict(params, redir_name)
guest_port = int(redir_params.get("guest_port"))
--
1.5.4.1