9p: removed division into OS-specific files for StartVsockShares,

return created 9p servers for StartShares

Author: redbeam

cmd/crc/cmd/daemon.go

@@ -254,7 +254,7 @@ func run(configuration *types.Configuration) error {
 	if err != nil {
 		return err
 	}
-	if err := fs9p.StartShares([]fs9p.Mount9p{{Listener: listener9p, Path: constants.GetHomeDir()}}); err != nil {
+	if _, err := fs9p.StartShares([]fs9p.Mount9p{{Listener: listener9p, Path: constants.GetHomeDir()}}); err != nil {
 		return err
 	}
 

pkg/fileserver/fs9p/shares.go

@@ -4,20 +4,35 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/linuxkit/virtsock/pkg/hvsock"
 	"github.com/sirupsen/logrus"
 )
 
-type Mount struct {
-	Listener net.Listener
+// Mount9p represents an exposed directory path with the listener
+// the 9p server is bound to
+type Mount9p struct {
 	Path     string
+	Listener net.Listener
+}
+
+// VsockMount9p represents an exposed directory path with the Vsock GUID
+// the 9p server is bound to
+type VsockMount9p struct {
+	Path      string
+	VsockGuid string
 }
 
-func StartShares(plan9Mounts []Mount) (defErr error) {
-	for _, m := range plan9Mounts {
+// StartShares starts a new 9p server for each of the supplied mounts.
+func StartShares(mounts []Mount9p) (servers []*Server, defErr error) {
+	servers9p := []*Server{}
+	for _, m := range mounts {
 		server, err := New9pServer(m.Listener, m.Path)
 		if err != nil {
-			return fmt.Errorf("serving directory %s on %s: %w", m.Path, m.Listener.Addr().String(), err)
+			return nil, fmt.Errorf("serving directory %s on %s: %w", m.Path, m.Listener.Addr().String(), err)
 		}
+
+		servers9p = append(servers9p, server)
+
 		defer func() {
 			if defErr != nil {
 				if err := server.Stop(); err != nil {
@@ -38,5 +53,30 @@ func StartShares(plan9Mounts []Mount) (defErr error) {
 		}()
 	}
 
-	return nil
+	return servers9p, nil
+}
+
+// StartVsockShares starts serving the given shares on vsocks instead of TCP sockets.
+// The vsocks used must already be defined before StartVsockShares is called.
+func StartVsockShares(mounts []VsockMount9p) ([]*Server, error) {
+	mounts9p := []Mount9p{}
+	for _, mount := range mounts {
+		service, err := hvsock.GUIDFromString(mount.VsockGuid)
+		if err != nil {
+			return nil, fmt.Errorf("parsing vsock guid %s: %w", mount.VsockGuid, err)
+		}
+
+		listener, err := hvsock.Listen(hvsock.Addr{
+			VMID:      hvsock.GUIDWildcard,
+			ServiceID: service,
+		})
+		if err != nil {
+			return nil, fmt.Errorf("retrieving listener for vsock %s: %w", mount.VsockGuid, err)
+		}
+
+		logrus.Debugf("Going to serve directory %s on vsock %s", mount.Path, mount.VsockGuid)
+		mounts9p = append(mounts9p, Mount9p{Path: mount.Path, Listener: listener})
+	}
+
+	return StartShares(mounts9p)
 }