Skip to content

Commit 4eafa75

Browse files
committed
9p: temporarily removed StartVsockShares until vsock support is added into 9pfs client
1 parent e6c485d commit 4eafa75

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ require (
3131
github.com/klauspost/compress v1.18.0
3232
github.com/klauspost/cpuid/v2 v2.3.0
3333
github.com/kofalt/go-memoize v0.0.0-20220914132407-0b5d6a304579
34-
github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2
3534
github.com/mattn/go-colorable v0.1.14
3635
github.com/mdlayher/vsock v1.2.1
3736
github.com/onsi/ginkgo/v2 v2.23.4
@@ -139,6 +138,7 @@ require (
139138
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
140139
github.com/klauspost/pgzip v1.2.6 // indirect
141140
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
141+
github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 // indirect
142142
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
143143
github.com/mailru/easyjson v0.7.7 // indirect
144144
github.com/mattn/go-isatty v0.0.20 // indirect

pkg/fileserver/fs9p/shares.go

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"net"
66

7-
"github.com/linuxkit/virtsock/pkg/hvsock"
87
"github.com/sirupsen/logrus"
98
)
109

@@ -59,24 +58,6 @@ func StartShares(mounts []Mount9p) (servers []*Server, defErr error) {
5958
// StartVsockShares starts serving the given shares on vsocks instead of TCP sockets.
6059
// The vsocks used must already be defined before StartVsockShares is called.
6160
func StartVsockShares(mounts []VsockMount9p) ([]*Server, error) {
62-
mounts9p := []Mount9p{}
63-
for _, mount := range mounts {
64-
service, err := hvsock.GUIDFromString(mount.VsockGUID)
65-
if err != nil {
66-
return nil, fmt.Errorf("parsing vsock guid %s: %w", mount.VsockGUID, err)
67-
}
68-
69-
listener, err := hvsock.Listen(hvsock.Addr{
70-
VMID: hvsock.GUIDWildcard,
71-
ServiceID: service,
72-
})
73-
if err != nil {
74-
return nil, fmt.Errorf("retrieving listener for vsock %s: %w", mount.VsockGUID, err)
75-
}
76-
77-
logrus.Debugf("Going to serve directory %s on vsock %s", mount.Path, mount.VsockGUID)
78-
mounts9p = append(mounts9p, Mount9p{Path: mount.Path, Listener: listener})
79-
}
80-
81-
return StartShares(mounts9p)
61+
// temporarily removed until vsock support is added into 9pfs client
62+
return nil, nil
8263
}

0 commit comments

Comments
 (0)