Skip to content

Commit

Permalink
13380 Add virtio-9p (aka VirtFS) filesystem sharing to bhyve
Browse files Browse the repository at this point in the history
Portions contributed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Jorge Schrauwen <sjorge@blackdot.be>
Approved by: Robert Mustacchi <rm@fingolfin.org>
  • Loading branch information
jasonbking authored and citrus-it committed Oct 7, 2021
1 parent 2d2dd83 commit aa693e9
Show file tree
Hide file tree
Showing 44 changed files with 12,810 additions and 9 deletions.
2 changes: 2 additions & 0 deletions exception_lists/cstyle
Expand Up @@ -1357,6 +1357,7 @@ usr/src/cmd/bhyve/pci_lpc.[ch]
usr/src/cmd/bhyve/pci_nvme.c
usr/src/cmd/bhyve/pci_passthru.c
usr/src/cmd/bhyve/pci_uart.c
usr/src/cmd/bhyve/pci_virtio_9p.c
usr/src/cmd/bhyve/pci_virtio_block.c
usr/src/cmd/bhyve/pci_virtio_console.c
usr/src/cmd/bhyve/pci_virtio_net.c
Expand Down Expand Up @@ -1390,3 +1391,4 @@ usr/src/uts/i86pc/io/vmm/amd/amdvi_*.[ch]
usr/src/uts/i86pc/io/vmm/amd/ivrs_*.c
usr/src/uts/i86pc/sys/vmm.h
usr/src/uts/i86pc/sys/vmm_dev.h
usr/src/lib/lib9p/common/*
1 change: 1 addition & 0 deletions exception_lists/hdrchk
Expand Up @@ -433,3 +433,4 @@ usr/src/uts/i86pc/io/vmm/vmm_util.h
usr/src/uts/i86pc/io/vmm/x86.h
usr/src/uts/i86pc/sys/vmm.h
usr/src/uts/i86pc/sys/vmm_dev.h
usr/src/lib/lib9p/common/*
6 changes: 6 additions & 0 deletions exception_lists/packaging
Expand Up @@ -861,6 +861,12 @@ usr/lib/amd64/libdwarf.so i386
usr/lib/sparcv9/libdwarf.so sparc
usr/lib/libdwarf.so

#
# lib9p is private
#
usr/include/lib9p.h
usr/lib/amd64/lib9p.so i386

#
# We're not quite ready to ship ctfconvert and ctfmerge
#
Expand Down
2 changes: 2 additions & 0 deletions exception_lists/wscheck
Expand Up @@ -69,6 +69,7 @@ usr/src/cmd/bhyve/pci_lpc.[ch]
usr/src/cmd/bhyve/pci_nvme.c
usr/src/cmd/bhyve/pci_passthru.c
usr/src/cmd/bhyve/pci_uart.c
usr/src/cmd/bhyve/pci_virtio_9p.c
usr/src/cmd/bhyve/pci_virtio_block.c
usr/src/cmd/bhyve/pci_virtio_console.c
usr/src/cmd/bhyve/pci_virtio_net.c
Expand All @@ -95,3 +96,4 @@ usr/src/cmd/bhyve/xmsr.[ch]
usr/src/cmd/bhyvectl/bhyvectl.c
usr/src/contrib/bhyve/*
usr/src/lib/libvmmapi/common/vmmapi.[ch]
usr/src/lib/lib9p/common/*
5 changes: 5 additions & 0 deletions usr/src/cmd/bhyve/Makefile
Expand Up @@ -56,6 +56,7 @@ SRCS = acpi.c \
pci_nvme.c \
pci_passthru.c \
pci_uart.c \
pci_virtio_9p.c \
pci_virtio_block.c \
pci_virtio_console.c \
pci_virtio_net.c \
Expand Down Expand Up @@ -115,6 +116,7 @@ CPPFLAGS = -I$(COMPAT)/bhyve -I$(CONTRIB)/bhyve \
-I$(COMPAT)/bhyve/amd64 -I$(CONTRIB)/bhyve/amd64 \
-I$(CONTRIB)/bhyve/dev/usb/controller \
-I$(CONTRIB)/bhyve/dev/mii \
-I$(SRC)/lib/lib9p/common \
-I$(SRC)/uts/common/io/e1000api \
$(CPPFLAGS.master) \
-I$(SRC)/uts/i86pc/io/vmm \
Expand All @@ -128,6 +130,8 @@ pci_nvme.o := SMOFF += kmalloc_wrong_size

pci_passthru.o := CERRWARN += -_gcc10=-Wno-address-of-packed-member

pci_virtio_9p.o := SMOFF += kmalloc_wrong_size

pci_xhci.o := CERRWARN += -_gcc10=-Wno-address-of-packed-member

SMOFF += all_func_returns,leaks,no_if_block
Expand All @@ -136,6 +140,7 @@ SMOFF += all_func_returns,leaks,no_if_block
CSTD= $(CSTD_GNU99)

$(PROG) := LDLIBS += \
-l9p \
-lsocket \
-lnsl \
-ldlpi \
Expand Down
6 changes: 0 additions & 6 deletions usr/src/cmd/bhyve/README.sync
Expand Up @@ -24,12 +24,6 @@ The draft Save/Restore functionality, added in FreeBSD commit
yet. It is not built by default in FreeBSD, so we're not interested in taking
it until it successfully endures more in-depth testing.

The VirtFS filesystem sharing feature, added in FreeBSD commit
100353cfbf882e23c911300ebd0cb458bd3ee975, has not been synced into illumos bhyve
yet. It depends on the userland lib9p which needs a fair amount of work to
build and run on illumos. The integration of this feature is being tracked in
https://www.illumos.org/issues/13380

The stub usr/src/compat/bhyve/stdatomic.h file only includes enough glue
to satisfy the use of <stdatomic.h> in usr/src/cmd/bhyve/rfb.c, and in
particular assumes that atomic variables are sized as an int. If other bhyve
Expand Down

0 comments on commit aa693e9

Please sign in to comment.