From 1a963651c683f3c54c061326ae43e411fd2bfa73 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sat, 13 Apr 2024 09:32:28 -0700 Subject: [PATCH 1/2] boot-qemu.py: Fix '--efi' for x86_64 Pretty obvious typo... Signed-off-by: Nathan Chancellor --- boot-qemu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot-qemu.py b/boot-qemu.py index 81807cd..b35ddcb 100755 --- a/boot-qemu.py +++ b/boot-qemu.py @@ -699,8 +699,8 @@ def run(self): Path('OVMF/OVMF_VARS.fd'), # Debian and Ubuntu ] ovmf_vars = utils.find_first_file(usr_share, ovmf_vars_locations) - self._efi_vars = Path(utils.BOOT_UTILS, 'images', self.initrd_arch, - ovmf_vars.name) + self._efi_vars = Path(utils.BOOT_UTILS, 'images', + self._initrd_arch, ovmf_vars.name) # This file is in /usr/share, so it must be copied in order to be # modified. shutil.copyfile(ovmf_vars, self._efi_vars) From 0d039f108d44174d04d7629aac5eb15616e55725 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sat, 13 Apr 2024 09:33:26 -0700 Subject: [PATCH 2/2] boot-qemu.py: Use a more modern machine type for x86 machines The 'q35' machine has a more modern chipset, which can allow testing more kernel code virtually. Signed-off-by: Nathan Chancellor --- boot-qemu.py | 1 + 1 file changed, 1 insertion(+) diff --git a/boot-qemu.py b/boot-qemu.py index b35ddcb..2b07c1b 100755 --- a/boot-qemu.py +++ b/boot-qemu.py @@ -661,6 +661,7 @@ def __init__(self): self._default_kernel_path = Path('arch/x86/boot/bzImage') self._initrd_arch = 'x86' self._qemu_arch = 'i386' + self._qemu_args += ['-M', 'q35'] def run(self): if self.use_kvm and not self.efi: