bhyve: virtio shares definitions between sys/dev/virtio

[khng]

Summary

Definitions inside usr.sbin/bhyve/virtio.h are thrown away.
Definitions in sys/dev/virtio are used instead.

This reduces code duplication.

Submitted by: Ka Ho Ng <[e-mail]>
Sponsored by: The FreeBSD Foundation

[khng]

VRING_AVAIL_F_NO_INTERRUPT and VRING_USED_F_NO_NOTIFY can also be removed

[khng]

Replace VTCFG_R with VIRTIO_PCI_/VIRTIO_MSI_ from sys/dev/virtio/pci/virtio_pci_legacy_var.h

[khng]

Comment fix

[rew]

take my suggestions/questions with a grain of salt as I'm not familiar with this area of the code..

fundamentally though, this looks like a good change.

sys/dev/virtio/virtio.h

33–34

I got this error when compiling bhyve:

...[ clipped ] ...
-Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments -c /usr/src/usr.sbin/bhyve/pci_virtio_rnd.c -o pci_virtio_rnd.o
In file included from /usr/src/usr.sbin/bhyve/pci_virtio_rnd.c:63:
In file included from /usr/src/usr.sbin/bhyve/virtio.h:36:
In file included from /usr/src/sys/dev/virtio/virtio.h:34:
/usr/src/sys/dev/virtio/virtio_endian.h:42:15: error: unknown type name 'bool'
static inline bool
[... clipped ...]
(9 errors generated)

fixed the error: https://reviews.freebsd.org/differential/diff/85257/

I provided the diff for context since virtio_endian.h isn't in the review

usr.sbin/bhyve/virtio.h

132–159

I wonder why these were __packed, but their corresponding structs in virtio_ring.h aren't?

Only a question, not a suggestion for change.

178–179

vring_size() returns an int

[khng]

• Fix rew@'s compilation error
• vring_size_aligned()'s return type should match vring_size()'s

[khng]

usr.sbin/bhyve/virtio.h

132–159

These __packed does seem unnecessary to me. They belonged to 366f60834ff8e which was the first commit introducing usr.sbin/bhyve/virtio.h.

[khng]

Reuse ISR status flags from sys/dev/virtio

[grehan]

Thanks for doing this; a long overdue change.

[khng]

D29084?id=85260 was accidentally reverted.

[khng]

vring_size has to be further aligned. Do it in vring_size_aligned now.

See 2.6.2 Legacy Interfaces: A Note on Virtqueue Layout

[khng]

In D29084#652080, @khng300_gmail.com wrote:

vring_size has to be further aligned. Do it in vring_size_aligned now.

See 2.6.2 Legacy Interfaces: A Note on Virtqueue Layout

Thanks rew@ for pointing that out.

[grehan]

Good catch rew :)

[philip]

Approved by: philip (mentor)