qemu: Convert KERNEL_RELEASE_PATH to --release-path

Author: mpe

lib/qemu.py

@@ -41,6 +41,7 @@ def __init__(self, machine):
         self.prompt = None
         self.user = 'root'
         self.password = None
+        self.expected_release = None
 
     def machine_is(self, needle):
         return self.machine.startswith(needle)
@@ -70,7 +71,7 @@ def configure_from_args(self, orig_args):
         parser.add_argument('--mount', dest='mounts',  type=str, default=[], action='append', help='Host mount points')
         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')
         args = parser.parse_args(orig_args)
 
         if args.gdb:
@@ -110,13 +111,20 @@ def configure_from_args(self, orig_args):
         if args.cmdline:
             self.cmdline.append(args.cmdline)
 
+        if args.release_path:
+            self.expected_release = read_expected_release(args.release_path)
+
         self.compat_rootfs = args.compat_rootfs
         self.use_vof = args.use_vof
         self.quiet = args.quiet
         self.net_tests = args.net_tests
         self.host_mounts.extend(args.mounts)
 
     def apply_defaults(self):
+        if not self.expected_release:
+            logging.error("Couldn't find kernel.release")
+            return
+            
         if self.machine_is('pseries'):
             if self.accel == 'tcg':
                 self.machine_caps += ['cap-htm=off']
@@ -484,6 +492,7 @@ def qemu_main(qconf):
     p.push_prompt(qconf.prompt)
     qconf.boot_func(p, boot_timeout, qconf)
 
+    logging.info(f'Looking for kernel version: {qconf.expected_release}')
     p.send('echo "booted-revision: `uname -r`"')
     p.expect(f'booted-revision: {qconf.expected_release}')
     p.expect_prompt()

lib/utils.py

@@ -69,12 +69,13 @@ def get_vmlinux():
     return vmlinux
 
 
+def read_expected_release(path):
+    expected_release = open(path).read().strip()
+    return expected_release
+
+
 def get_expected_release():
     candidates = []
-    env = os.environ.get('KERNEL_RELEASE_PATH', None)
-    if env:
-        candidates.append(env)
-
     default_path = 'include/config/kernel.release'
     env = os.environ.get('KBUILD_OUTPUT', None)
     if env:
@@ -83,14 +84,9 @@ def get_expected_release():
     candidates.extend([default_path, 'kernel.release'])
     for path in candidates:
         if os.path.isfile(path):
-            break
-    else:
-        logging.error(f"Couldn't find kernel.release, export KERNEL_RELEASE_PATH")
-        return None
+            return read_expected_release(path)
 
-    expected_release = open(path).read().strip()
-    logging.info(f'Looking for kernel version: {expected_release}')
-    return expected_release
+    return None
 
 
 def test_harness(func, name, *args, **kwargs):

scripts/boot/qemu-44x

@@ -7,7 +7,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc

scripts/boot/qemu-e500mc

@@ -12,7 +12,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc

scripts/boot/qemu-g3beige

@@ -15,7 +15,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc

scripts/boot/qemu-g5

@@ -13,7 +13,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64

scripts/boot/qemu-mac99

@@ -14,7 +14,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC=~/src/qemu/ppc-softmmu/qemu-system-ppc

scripts/boot/qemu-powernv

@@ -7,7 +7,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64

scripts/boot/qemu-ppc64e

@@ -11,7 +11,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64

scripts/boot/qemu-pseries

@@ -7,7 +7,6 @@
 # Or:
 #
 # export VMLINUX_PATH=~/src/linux/vmlinux
-# export KERNEL_RELEASE_PATH=~/src/linux/include/config/kernel.release
 #
 # Optional:
 # export QEMU_SYSTEM_PPC64=~/src/qemu/ppc64-softmmu/qemu-system-ppc64