bhyve: Defer virtio-console PORT_NAME until the guest is ready
AcceptedPublic
Actions

Authored by hayzam_gmail.com on Sat, Sep 19, 5:53 PM.

Details

Reviewers

markj

Group Reviewers

bhyve

Summary

pci_vtcon_announce_port() sends VIRTIO_CONSOLE_PORT_NAME immediately
after VIRTIO_CONSOLE_DEVICE_ADD, without waiting for the guest to
initialize the port. The Windows virtio-serial driver ignores the
name if the port is not yet available, which can prevent the QEMU
guest agent from finding org.qemu.guest_agent.0.

Send the name after the guest reports successful port initialization
with VIRTIO_CONSOLE_PORT_READY, as QEMU does.

While here, validate the guest-supplied port ID before forming a
pointer into vsc_ports[].

This ports the PORT_NAME ordering fix from illumos change 18082.

Obtained from: illumos 643ee887be44404b690eeaff14f20a27ad3c715c

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 77096
Build 73979: arc lint + arc unit

Event Timeline

hayzam_gmail.com created this revision.Sat, Sep 19, 5:53 PM

Herald added a reviewer: bhyve. · View Herald TranscriptSat, Sep 19, 5:53 PM

Herald added subscribers: bcran, rgrimes, imp. · View Herald Transcript

hayzam_gmail.com requested review of this revision.Sat, Sep 19, 5:53 PM

Harbormaster completed remote builds in B77096: Diff 187242.Sat, Sep 19, 5:53 PM

markj added inline comments.Tue, Sep 22, 2:12 PM

usr.sbin/bhyve/pci_virtio_console.c
530	How is it possible to have `tmp->vsp_name == NULL`?

Address review comment

Harbormaster completed remote builds in B77185: Diff 187423.Tue, Sep 22, 2:38 PM

hayzam_gmail.com added inline comments.Tue, Sep 22, 2:38 PM

usr.sbin/bhyve/pci_virtio_console.c
530	Ah it can't be NULL here since name= is mandatory for a virtio-console port, I'll drop the check. It came in verbatim with the illumos change, which mirrors QEMU, where port names really seem to be optional.