Skip to content
Merged
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
28 changes: 27 additions & 1 deletion qubesadmin/tools/qvm_start_daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,14 @@ async def start_gui_for_vm(self, vm, monitor_layout=None):
"""
if getattr(vm, "is_preload", False):
return

if vm.xid < 0:
vm.log.warning(
"Skipping GUI start: invalid XID (%s)",
vm.xid,
)
return

guid_cmd = self.common_guid_args(vm)
guid_cmd.extend(["-d", str(vm.xid)])

Expand Down Expand Up @@ -753,6 +761,15 @@ async def start_gui_for_stubdomain(self, vm, force=False):
"""
if getattr(vm, "is_preload", False):
return

stubdom_xid = getattr(vm, "stubdom_xid", -1)
if stubdom_xid < 0:
vm.log.warning(
"Skipping stubdomain GUI start: invalid stubdom XID (%s)",
stubdom_xid,
)
return

want_stubdom = force
if not want_stubdom and vm.features.check_with_template(
"gui-emulated", False
Expand Down Expand Up @@ -786,10 +803,19 @@ async def start_audio_for_vm(self, vm):
"""
if getattr(vm, "is_preload", False):
return

xid = self.pacat_domid(vm)
if xid < 0:
vm.log.warning(
"Skipping AUDIO start: invalid XID (%s)",
xid,
)
return

pacat_cmd = [
PACAT_DAEMON_PATH,
"-l",
str(self.pacat_domid(vm)),
str(xid),
vm.name,
]
vm.log.info("Starting AUDIO")
Expand Down