Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UEFI test #626

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 47 additions & 20 deletions qubes/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1328,33 +1328,60 @@ def prepare_hvm_system_linux(self, vm, init_script, extra_files=None):

def create_bootable_iso(self):
"""Create simple bootable ISO image.
Type 'poweroff' to it to terminate that VM.
Type 'halt' to it to terminate that VM.
"""
isolinux_cfg = (
'prompt 1\n'
'label poweroff\n'
' kernel poweroff.c32\n'
)
output_fd, output_path = tempfile.mkstemp('.iso')
with tempfile.TemporaryDirectory() as tmp_dir:
f = os.open(tmp_dir, os.O_RDONLY|os.O_DIRECTORY)
try:
shutil.copy('/usr/share/syslinux/isolinux.bin', tmp_dir)
shutil.copy('/usr/share/syslinux/ldlinux.c32', tmp_dir)
shutil.copy('/usr/share/syslinux/poweroff.c32', tmp_dir)
with open(os.path.join(tmp_dir, 'isolinux.cfg'), 'w') as cfg:
cfg.write(isolinux_cfg)
subprocess.check_call(['genisoimage', '-o', output_path,
'-c', 'boot.cat',
'-b', 'isolinux.bin',
os.mkdir('os', mode=0o755, dir_fd=f)
os.mkdir('iso', mode=0o755, dir_fd=f)
os.mkdir('os/images', mode=0o755, dir_fd=f)
os.mkdir('os/EFI', mode=0o755, dir_fd=f)
os.mkdir('os/EFI/BOOT', mode=0o755, dir_fd=f)
with open(f'/proc/self/fd/{f}/os/images/boot_hybrid.img', 'wb') as v:
subprocess.check_call(['grub2-mkimage',
'-O', 'i386-pc-eltorito',
'-d', '/usr/lib/grub/i386-pc',
'-p', '/boot/grub2',
'iso9660', 'biosdisk', 'halt'], stdout=v)
with open(f'/proc/self/fd/{f}/os/EFI/BOOT/BOOTX64.EFI', 'wb') as v:
subprocess.check_call(['grub2-mkimage',
'-O', 'x86_64-efi',
'-d', '/usr/lib/grub/x86_64-efi',
'-p', '/boot/grub2',
'iso9660', 'disk', 'halt'], stdout=v)
graft_path = '.=' + os.path.join(tmp_dir, "os").replace("\\", "\\\\").replace("=", "\\=")
efiboot_img = os.path.join(tmp_dir, 'os/images/efiboot.img')
subprocess.check_call(['sudo', 'mkefiboot', '--label=ANACONDA',
os.path.join(tmp_dir, 'os/EFI/BOOT'),
efiboot_img])
subprocess.check_call(['sudo', 'chmod', '-R', 'go+rX', tmp_dir])
subprocess.check_call(['xorrisofs',
'-o', output_path,
'--grub2-mbr', 'os/images/boot_hybrid.img',
'--mbr-force-bootable',
'--gpt-iso-bootable',
'-partition_offset', '16',
'-append_partition', '2', '0xef', efiboot_img,
'-iso_mbr_part_type', 'EBD0A0A2-B9E5-4433-87C0-68B6B72699C7',
'-appended_part_as_gpt',
'-c', 'boot.cat', '--boot-catalog-hide',
'-eltorito-boot', 'images/boot_hybrid.img',
'-no-emul-boot',
'-boot-load-size', '4',
'-boot-info-table',
'-q',
tmp_dir])
except FileNotFoundError:
self.skipTest('syslinux or genisoimage not installed')
os.close(output_fd)
self.addCleanup(os.unlink, output_path)
'--grub2-boot-info',
'-eltorito-alt-boot',
'-e', '--interval:appended_partition_2:all::',
'-no-emul-boot',
'-graft-points', graft_path,
'boot/grub2/i386-pc=/usr/lib/grub/i386-pc',
'boot/grub2/x86_64-efi=/usr/lib/grub/x86_64-efi'],
cwd=tmp_dir)
self.addCleanup(os.unlink, output_path)
finally:
os.close(f)
return output_path

def create_local_file(self, filename, content, mode='w'):
Expand Down
39 changes: 33 additions & 6 deletions qubes/tests/integ/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,44 @@ def test_120_start_standalone_with_cdrom_dom0(self):
(stdout, _) = self.loop.run_until_complete(p.communicate())
self.assertEqual(p.returncode, 0, stdout)
# check if VM do not crash instantly
self.loop.run_until_complete(asyncio.sleep(5))
self.loop.run_until_complete(asyncio.sleep(50))
self.assertTrue(self.vm.is_running())
# Type 'poweroff'
# Type 'halt'
subprocess.check_call(['xdotool', 'search', '--name', self.vm.name,
'type', '--window', '%1', 'poweroff\r'])
'type', '--window', '%1', 'halt\r'])
for _ in range(10):
if not self.vm.is_running():
break
self.loop.run_until_complete(asyncio.sleep(1))
self.assertFalse(self.vm.is_running())

def test_121_start_uefi(self):
vmname = self.make_vm_name('appvm')
self.vm = self.app.add_new_vm('StandaloneVM', label='red', name=vmname)
self.loop.run_until_complete(self.vm.create_on_disk())
self.vm.kernel = None
self.vm.virt_mode = 'hvm'
self.vm.features["uefi"] = "1"
iso_path = self.create_bootable_iso()
# start the VM using qvm-start tool, to test --cdrom option there
p = self.loop.run_until_complete(asyncio.create_subprocess_exec(
'qvm-start', '--cdrom=dom0:' + iso_path, self.vm.name,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
(stdout, _) = self.loop.run_until_complete(p.communicate())
self.assertEqual(p.returncode, 0, stdout)
# check if VM do not crash instantly
self.loop.run_until_complete(asyncio.sleep(50))
self.assertTrue(self.vm.is_running())
# Type 'halt'
subprocess.check_call(['xdotool', 'search', '--name', self.vm.name,
'type', '--window', '%1', 'halt\r'])
for _ in range(10):
if not self.vm.is_running():
break
self.loop.run_until_complete(asyncio.sleep(1))
self.assertFalse(self.vm.is_running())


def test_130_autostart_disable_on_remove(self):
vm = self.app.add_new_vm(qubes.vm.appvm.AppVM,
name=self.make_vm_name('vm'),
Expand Down Expand Up @@ -716,11 +743,11 @@ def test_121_start_standalone_with_cdrom_vm(self):
(stdout, _) = self.loop.run_until_complete(p.communicate())
self.assertEqual(p.returncode, 0, stdout)
# check if VM do not crash instantly
self.loop.run_until_complete(asyncio.sleep(5))
self.loop.run_until_complete(asyncio.sleep(50))
self.assertTrue(self.vm.is_running())
# Type 'poweroff'
# Type 'halt'
subprocess.check_call(['xdotool', 'search', '--name', self.vm.name,
'type', '--window', '%1', 'poweroff\r'])
'type', '--window', '%1', 'halt\r'])
for _ in range(10):
if not self.vm.is_running():
break
Expand Down