From f214045d1abece9ea7b9cb9727726f4ed56ef1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Holz?= Date: Mon, 1 Jan 2024 20:38:34 +0100 Subject: [PATCH] Meta: Set QEMU title and add QMP socket on non-x86 machines in run.py aarch64 does an early return (except for CI), so this code wasn't executed. --- Meta/run.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Meta/run.py b/Meta/run.py index 2840bc6d75..ef55546654 100755 --- a/Meta/run.py +++ b/Meta/run.py @@ -694,6 +694,11 @@ def setup_kernel(config: Configuration): def setup_machine_devices(config: Configuration): # TODO: Maybe disable SPICE everwhere except the default machine? + if config.qemu_kind != QEMUKind.NativeWindows: + config.extra_arguments.extend(["-qmp", "unix:qmp-sock,server,nowait"]) + + config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors"]) + # Architecture specifics. if config.architecture == Arch.Aarch64: config.qemu_machine = "raspi3b" @@ -804,11 +809,6 @@ def setup_machine_devices(config: Configuration): case MachineType.QEMUGrub | MachineType.QEMUExtLinux: config.kernel_cmdline = [] - if config.qemu_kind != QEMUKind.NativeWindows: - config.extra_arguments.extend(["-qmp", "unix:qmp-sock,server,nowait"]) - - config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors"]) - def assemble_arguments(config: Configuration) -> list[str | Path]: if config.machine_type == MachineType.Bochs: