tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Revert "Lock ssh handshake"

Browse Source 
This reverts commit b558269ac3.
This commit is contained in:
dump_stack() 2023-05-08 14:40:57 +00:00
parent b558269ac3
commit 2e5c386c42
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu/qemu-kernel.go
View File

@ -15,7 +15,6 @@ import (
"os/exec" "os/exec"
"runtime" "runtime"
"strings" "strings"
"sync"
"syscall" "syscall"
"time" "time"
@ -365,12 +364,7 @@ func (q System) WaitForSSH(timeout time.Duration) error {
return errors.New("no ssh (timeout)") return errors.New("no ssh (timeout)")
} }
var sshMu sync.Mutex
func (q System) ssh(user string) (client *ssh.Client, err error) { func (q System) ssh(user string) (client *ssh.Client, err error) {
sshMu.Lock()
defer sshMu.Unlock()
cfg := &ssh.ClientConfig{ cfg := &ssh.ClientConfig{
User: user, User: user,
HostKeyCallback: ssh.InsecureIgnoreHostKey(), HostKeyCallback: ssh.InsecureIgnoreHostKey(),
@ -470,9 +464,7 @@ func (q System) scp(user, localPath, remotePath string, recursive bool) (err err
HostKeyCallback: ssh.InsecureIgnoreHostKey(), HostKeyCallback: ssh.InsecureIgnoreHostKey(),
} }
sshMu.Lock()
client, err := scp.NewClient(q.sshAddrPort, cfg, &scp.ClientOption{}) client, err := scp.NewClient(q.sshAddrPort, cfg, &scp.ClientOption{})
sshMu.Unlock()
if err != nil { if err != nil {
return return
} }