qemu: Convert ROOT_DISK_PATH to --root-disk-path

Author: mpe

lib/qemu.py

@@ -45,6 +45,14 @@ def __init__(self, machine):
         self.expected_release = None
         self.vmlinux = None
 
+        # Detect root disks if we're called from scripts/boot/qemu-xxx
+        base = os.path.dirname(sys.argv[0])
+        path = f'{base}/../../root-disks'
+        if os.path.isdir(path):
+            self.root_disk_path = path
+        else:
+            self.root_disk_path = None
+
     def machine_is(self, needle):
         return self.machine.startswith(needle)
 
@@ -79,6 +87,7 @@ def configure_from_args(self, orig_args):
         parser.add_argument('--modules-path', type=str, help='Path to modules tarball')
         parser.add_argument('--cap', dest='machine_caps',  type=str, default=[], action='append', help='Machine caps')
         parser.add_argument('--qemu-path', dest='qemu_path', type=str, help='Path to qemu bin directory')
+        parser.add_argument('--root-disk-path', dest='root_disk_path', type=str, help='Path to root disk directory')
         args = parser.parse_args(orig_args)
 
         if args.gdb:
@@ -130,6 +139,9 @@ def configure_from_args(self, orig_args):
         if args.qemu_path:
             self.qemu_path = args.qemu_path
 
+        if args.root_disk_path:
+            self.root_disk_path = args.root_disk_path
+
         self.compat_rootfs = args.compat_rootfs
         self.use_vof = args.use_vof
         self.quiet = args.quiet
@@ -145,7 +157,11 @@ def apply_defaults(self):
         if not self.vmlinux:
             logging.error("Can't find kernel vmlinux")
             return
-            
+
+        if not self.root_disk_path:
+            logging.error("Couldn't locate root disks")
+            return
+ 
         if self.machine_is('pseries'):
             if self.accel == 'tcg':
                 self.machine_caps += ['cap-htm=off']
@@ -304,7 +320,7 @@ def prepare_cloud_image(self):
         if self.cloud_image is None:
             return
 
-        rdpath = get_root_disk_path()
+        rdpath = self.root_disk_path
         img_path = f'{rdpath}/{self.cloud_image}'
 
         if self.cloud_image.endswith('.qcow2'):
@@ -366,7 +382,7 @@ def cmd(self):
 
         if self.initrd:
             l.append('-initrd')
-            l.append(get_root_disk(self.initrd))
+            l.append(os.path.join(self.root_disk_path, self.initrd))
 
         if len(self.drives):
             l.extend(self.drives)
@@ -393,26 +409,6 @@ def qemu_monitor_shutdown(p):
     p.send('quit')
 
 
-def get_root_disk_path():
-    path = get_env_var('ROOT_DISK_PATH', None)
-    if path is not None:
-        return path
-
-    base = os.path.dirname(sys.argv[0])
-    # Assumes we're called from scripts/boot/qemu-xxx
-    path = f'{base}/../../root-disks'
-    if os.path.isdir(path):
-        return path
-
-    return ''
-
-
-def get_root_disk(fname):
-    val = os.path.join(get_root_disk_path(), fname)
-    logging.debug(f'Using rootfs {val}')
-    return val
-
-
 def get_qemu_version(emulator):
     p = PexpectHelper()
     p.spawn('%s --version' % emulator, quiet=True)

scripts/boot/qemu-44x

@@ -3,10 +3,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-44x
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import logging
 import os, sys

scripts/boot/qemu-e500mc

@@ -8,12 +8,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-e500mc
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-#
-# Expects ROOT_DISK_PATH to contain:
-#   ppc-rootfs.cpio.gz
 
 import logging
 import os, sys

scripts/boot/qemu-g3beige

@@ -11,10 +11,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-g3beige
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import logging
 import os, sys

scripts/boot/qemu-g5

@@ -9,10 +9,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-g5
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc64-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import os, sys
 sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')

scripts/boot/qemu-mac99

@@ -10,10 +10,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-mac99
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import logging
 import os, sys

scripts/boot/qemu-powernv

@@ -3,10 +3,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-powernv
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc64[le]-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import os, sys
 sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')

scripts/boot/qemu-ppc64e

@@ -7,16 +7,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-ppc64e
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-#
-# Expects ROOT_DISK_PATH to contain either:
-#   ppc64-novsx-rootfs.cpio.gz
-# or
-#   ppc-rootfs.cpio.gz
-#
-# if --compat-rootfs is specified.
 
 import logging
 import os, sys

scripts/boot/qemu-pseries

@@ -3,10 +3,6 @@
 # $ cd ~/src/linux
 # $ make
 # $ ~/src/ci-scripts/scripts/boot/qemu-pseries
-#
-# Optional:
-# export ROOT_DISK_PATH=~/some/directory
-# Expects ppc64[le]-rootfs.cpio.gz in ROOT_DISK_PATH
 
 import os, sys
 sys.path.append(f'{os.path.dirname(sys.argv[0])}/../../lib')