qemu: Convert VMLINUX_PATH to an argument

Author: mpe

lib/qemu.py

@@ -42,6 +42,7 @@ def __init__(self, machine):
         self.user = 'root'
         self.password = None
         self.expected_release = None
+        self.vmlinux = None
 
     def machine_is(self, needle):
         return self.machine.startswith(needle)
@@ -72,6 +73,7 @@ def configure_from_args(self, orig_args):
         parser.add_argument('--mount-cmd', dest='mount_command',  type=str, help="Command to run in mount point (default 'run')")
         parser.add_argument('--cmdline', type=str, help='Kernel command line arguments')
         parser.add_argument('--release-path', type=str, help='Path to kernel.release')
+        parser.add_argument('--kernel-path', type=str, help='Path to kernel (vmlinux)')
         args = parser.parse_args(orig_args)
 
         if args.gdb:
@@ -114,6 +116,9 @@ def configure_from_args(self, orig_args):
         if args.release_path:
             self.expected_release = read_expected_release(args.release_path)
 
+        if args.kernel_path:
+            self.vmlinux = args.kernel_path
+
         self.compat_rootfs = args.compat_rootfs
         self.use_vof = args.use_vof
         self.quiet = args.quiet
@@ -125,6 +130,10 @@ def apply_defaults(self):
             logging.error("Couldn't find kernel.release")
             return
 
+        if not self.vmlinux:
+            logging.error("Can't find kernel vmlinux")
+            return
+            
         if self.machine_is('pseries'):
             if self.accel == 'tcg':
                 self.machine_caps += ['cap-htm=off']

lib/utils.py

@@ -67,12 +67,11 @@ def get_vmlinux():
         if os.path.isfile(path):
             return path
 
-    vmlinux = get_env_var('VMLINUX_PATH', 'vmlinux')
-    if not os.path.isfile(vmlinux):
-        logging.error("Can't read kernel 'vmlinux'! Try setting VMLINUX_PATH")
-        return None
+    path = 'vmlinux'
+    if os.path.isfile(path):
+        return path
 
-    return vmlinux
+    return None
 
 
 def read_expected_release(path):

scripts/boot/qemu-44x

@@ -4,10 +4,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-44x
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-e500mc

@@ -9,10 +9,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-e500mc
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-g3beige

@@ -12,10 +12,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-g3beige
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-g5

@@ -10,10 +10,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-g5
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-mac99

@@ -11,10 +11,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-mac99
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-powernv

@@ -4,10 +4,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-powernv
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64
 #

scripts/boot/qemu-ppc64e

@@ -8,10 +8,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-ppc64e
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64
 # export ROOT_DISK_PATH=~/some/directory

scripts/boot/qemu-pseries

@@ -4,10 +4,6 @@
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-pseries
 #
-# Or:
-#
-# export VMLINUX_PATH=~/src/linux/vmlinux
-#
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64
 #