[PATCH 1/3] KVM test: Add the support of kernel and initrd option for qemu-kvm

From: Jason Wang <jasowang@redhat.com>
To: lmr@redhat.com, autotest@test.kernel.org
Cc: kvm@vger.kernel.org
Subject: [PATCH 1/3] KVM test: Add the support of kernel and initrd option for qemu-kvm
Date: Fri, 28 May 2010 16:25:01 +0800	[thread overview]
Message-ID: <20100528082501.31543.64111.stgit@dhcp-91-25.nay.redhat.com> (raw)

"-kernel" option is useful for both unattended installation and the
unittest in /kvm/user/test.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 client/tests/kvm/kvm_vm.py |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index bca9d15..c7eed56 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -360,6 +360,16 @@ 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 += " -kernel %s" % kernel
+        
+        initrd = params.get("initrd")
+        if initrd:
+            initrd = kvm_utils.get_path(root_dir, initrd)
+            qemu_cmd += " -initrd %s" % initrd
+        
         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"))

