diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/migration/guestperf/engine.py | 28 | ||||
| -rw-r--r-- | tests/migration/meson.build | 4 |
2 files changed, 28 insertions, 4 deletions
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index 59fca2c70b..cc06fac592 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -281,6 +281,26 @@ class Engine(object): resp = src.command("stop") paused = True + def _is_ppc64le(self): + _, _, _, _, machine = os.uname() + if machine == "ppc64le": + return True + return False + + def _get_guest_console_args(self): + if self._is_ppc64le(): + return "console=hvc0" + else: + return "console=ttyS0" + + def _get_qemu_serial_args(self): + if self._is_ppc64le(): + return ["-chardev", "stdio,id=cdev0", + "-device", "spapr-vty,chardev=cdev0"] + else: + return ["-chardev", "stdio,id=cdev0", + "-device", "isa-serial,chardev=cdev0"] + def _get_common_args(self, hardware, tunnelled=False): args = [ "noapic", @@ -289,8 +309,10 @@ class Engine(object): "noreplace-smp", "cgroup_disable=memory", "pci=noearly", - "console=ttyS0", ] + + args.append(self._get_guest_console_args()) + if self._debug: args.append("debug") else: @@ -308,12 +330,12 @@ class Engine(object): "-kernel", self._kernel, "-initrd", self._initrd, "-append", cmdline, - "-chardev", "stdio,id=cdev0", - "-device", "isa-serial,chardev=cdev0", "-m", str((hardware._mem * 1024) + 512), "-smp", str(hardware._cpus), ] + argv.extend(self._get_qemu_serial_args()) + if self._debug: argv.extend(["-device", "sga"]) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index f215ee7d3a..dd562355a1 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,7 +1,9 @@ +sysprof = dependency('sysprof-capture-4', required: false) + stress = executable( 'stress', files('stress.c'), - dependencies: [glib], + dependencies: [glib, sysprof], link_args: ['-static'], build_by_default: false, ) |