Skip to content

xenopsd: start vncterm for PVH guests #6363

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
merged 2 commits into from
Mar 17, 2025
Merged

xenopsd: start vncterm for PVH guests #6363

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ba6544
xenopsd: start vncterm for PVH guests
psafont Mar 17, 2025
24e8927
xenopsd: make vncterm less errorprone
psafont Mar 17, 2025
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
10 changes: 6 additions & 4 deletions ocaml/xenopsd/xc/xenops_server_xen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2313,10 +2313,12 @@ module VM = struct
)
(create_device_model_config vm vmextra vbds vifs vgpus vusbs) ;
match vm.Vm.ty with
| Vm.PV {vncterm= true; vncterm_ip= ip; _}
| Vm.PVinPVH {vncterm= true; vncterm_ip= ip; _} ->
Service.PV_Vnc.start ~xs ?ip di.Xenctrl.domid
| _ ->
| PV {vncterm; vncterm_ip= ip; _}
| PVH {vncterm; vncterm_ip= ip; _}
| PVinPVH {vncterm; vncterm_ip= ip; _} ->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when vncterm ->

Copy link
Member Author

@psafont psafont Mar 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would mean I have to add explicit matches for when vncterm is false, which I'm trying to avoid.

if vncterm then
Service.PV_Vnc.start ~xs ?ip di.Xenctrl.domid
| HVM _ ->
()
with Device.Ioemu_failed (name, msg) ->
raise (Xenopsd_error (Failed_to_start_emulator (vm.Vm.id, name, msg)))
Expand Down
Loading