bhyve: Simplify control flow in the xhci device model
ClosedPublic
Actions

Authored by markj on Nov 6 2022, 7:35 PM.

Details

Reviewers

jhb
corvink

Group Reviewers

bhyve

Commits

rG055648ccb721: bhyve: Simplify control flow in the xhci device model
rGc4c368fb3ecc: bhyve: Simplify control flow in the xhci device model

Summary

We only need to call pci_xhci_xfer_complete() when handling a transfer
to the control endpoint, so move that code into the epid == 1 block and
eliminate a goto. Remove an unneeded reinitialization of setup_trb. No
functional change intended.

MFC after: 1 week

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 48304
Build 45190: arc lint + arc unit

Event Timeline

markj created this revision.Nov 6 2022, 7:35 PM

Herald added subscribers: bcran, rgrimes, imp. · View Herald TranscriptNov 6 2022, 7:35 PM

markj requested review of this revision.Nov 6 2022, 7:35 PM

Harbormaster completed remote builds in B48191: Diff 112695.Nov 6 2022, 7:35 PM

markj added a child revision: D37288: bhyve: Address warnings about potential unaligned accesses in fwctl.c.Nov 6 2022, 7:35 PM

markj added a parent revision: D37298: virtio: Silence a -Wunused warning.Nov 6 2022, 10:50 PM

corvink accepted this revision.Nov 7 2022, 8:05 AM

This revision is now accepted and ready to land.Nov 7 2022, 8:05 AM

jhb accepted this revision.Nov 7 2022, 8:10 PM

jhb added inline comments.

usr.sbin/bhyve/pci_xhci.c
1856–1857	I understand why it's there, but having back-to-back assignments of `err` like this is potentially a bit confusing. One option might be using separate variables for USB errors vs XHCI errors (either something verbose like `usb_error` and `xhci_error` or maybe something shorter like `uerror` and `xerror`)?