qemu: Add support for G5 with compat userspace

Make the compat userspace support generic and add a G5 wrapper script to
invoke it.

Author: mpe

lib/qemu.py

@@ -27,6 +27,7 @@ def __init__(self, machine):
         self.interactive = False
         self.drive = None
         self.initrd = None
+        self.compat_rootfs = False
         self.shutdown = None
         self.extra_args = []
         self.qemu_path = None
@@ -45,6 +46,7 @@ def configure_from_env(self):
         self.mem = get_env_var('QEMU_MEM_SIZE', self.mem)
         self.cloud_image = get_env_var('CLOUD_IMAGE', self.cloud_image)
         self.host_mount = get_env_var('QEMU_HOST_MOUNT', self.host_mount)
+        self.compat_rootfs = get_env_var('COMPAT_USERSPACE', self.compat_rootfs)
         self.cmdline += get_env_var('LINUX_CMDLINE', '') + ' '
         self.pexpect_timeout = int(get_env_var('QEMU_PEXPECT_TIMEOUT', self.pexpect_timeout))
         self.logpath = get_env_var('QEMU_CONSOLE_LOG', self.logpath)
@@ -131,7 +133,7 @@ def apply_defaults(self):
                 self.prompt = '\[root@fedora ~\]#'
 
         if self.initrd is None and self.drive is None and self.cloud_image is None:
-            if self.qemu_path.endswith('qemu-system-ppc'):
+            if self.compat_rootfs or self.qemu_path.endswith('qemu-system-ppc'):
                 subarch = 'ppc'
             elif get_endian(self.vmlinux) == 'little':
                 subarch = 'ppc64le'

scripts/boot/qemu-g5+compat

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export COMPAT_USERSPACE=1
+
+exec "$(dirname "$0")"/qemu-g5 $@

scripts/boot/qemu-ppc64e

@@ -44,9 +44,6 @@ def main():
     qconf.smp = 1
     qconf.cpu = 'e5500'
 
-    if os.environ.get('COMPAT_USERSPACE', False):
-        qconf.initrd = 'ppc-rootfs.cpio.gz'
-
     qconf.apply_defaults()
 
     return qemu_main(qconf)