Skip to content

Remove too strict checking for kernel on startup #634

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.

Sign up for GitHub

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

Merged
marmarek merged 2 commits into from
Nov 14, 2024
Merged

Remove too strict checking for kernel on startup #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9498dfe
Remove too strict checking for kernel on startup
marmarek Nov 12, 2024
9f3bdb4
tests: use simplified option for booting in-vm kernel
marmarek Nov 12, 2024
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
4 changes: 2 additions & 2 deletions qubes/tests/integ/grub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def test_010_template_based_vm(self):
'grub-xen package not installed')
class TC_40_PVGrub(GrubBase):
virt_mode = 'pv'
kernel = 'pvgrub2'
kernel = None

def setUp(self):
if 'fedora' in self.template:
Expand All @@ -176,7 +176,7 @@ class TC_41_HVMGrub(GrubBase):
'grub2-xen-pvh package not installed')
class TC_42_PVHGrub(GrubBase):
virt_mode = 'pvh'
kernel = 'pvgrub2-pvh'
kernel = None

def create_testcases_for_templates():
yield from qubes.tests.create_testcases_for_templates('TC_40_PVGrub',
Expand Down
3 changes: 0 additions & 3 deletions qubes/vm/qubesvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,9 +1188,6 @@ async def start(self, start_guid=True, notify_function=None,
f'not available'
)

if self.virt_mode == 'pvh' and not self.kernel:
raise qubes.exc.QubesException(
'virt_mode PVH require kernel to be set')
await self.storage.verify()

if self.netvm is not None:
Expand Down