From: Madhuri Appana <[email protected]>

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

diff --git a/client/virt/kvm_vm.py b/client/virt/kvm_vm.py
index fa258c3..109290c 100644
--- a/client/virt/kvm_vm.py
+++ b/client/virt/kvm_vm.py
@@ -684,6 +684,26 @@ class VM(virt_vm.BaseVM):
         if extra_params:
             qemu_cmd += " %s" % extra_params
 
+        guest_kernel = params.get("guest_kernel_kernel_path")
+        if guest_kernel:
+            if not os.path.exists(guest_kernel):
+                raise virt_vm.VMImageMissingError(guest_kernel)
+            qemu_cmd += add_kernel(help, guest_kernel)
+
+        guest_kernel_initrd = params.get("guest_kernel_initrd")
+        if guest_kernel_initrd:
+            if not os.path.exists(guest_kernel_initrd):
+                raise virt_vm.VMImageMissingError(guest_kernel_initrd)
+            qemu_cmd += add_initrd(help, guest_kernel_initrd)
+
+        if guest_kernel:
+            guest_kernel_cmdline = "selinux=0 console=ttyS0,115200 
console=tty0 "
+            guest_kernel_boot_options =  
params.get('guest_kernel_extra_boot_options')
+            if guest_kernel_boot_options:
+                guest_kernel_cmdline += guest_kernel_boot_options
+            # Add kernel arg
+            qemu_cmd += add_kernel_cmdline(help, guest_kernel_cmdline)
+
         return qemu_cmd
 
 
-- 
1.7.6.4

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

Reply via email to