Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

virt invokes RPC to resize console window #288

Merged
merged 3 commits into from
Dec 2, 2020
Merged

virt invokes RPC to resize console window #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9aef89
update libyavirt dep
jschwinger233 Nov 30, 2020
6d1ecaf
virt invokes ResizeConsoleWindow RPC
jschwinger233 Nov 30, 2020
5dfd847
drop empty exec msg
jschwinger233 Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cluster/calcium/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ func rawProcessVirtualizationInStream(
defer inStream.Close()

for cmd := range inCh {
if len(cmd) == 0 {
continue
}
if f, ok := specialPrefixCallback[string(cmd[:1])]; ok {
f(cmd[1:])
continue
Expand Down
5 changes: 1 addition & 4 deletions engine/virt/virt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ func (v *Virt) ExecExitCode(ctx context.Context, execID string) (code int, err e

// ExecResize resize exec tty
func (v *Virt) ExecResize(ctx context.Context, execID string, height, width uint) (err error) {
resizeCmd := fmt.Sprintf("yaexec resize -r %d -c %d", height, width)
msg, err := v.client.ExecuteGuest(ctx, execID, strings.Split(resizeCmd, " "))
log.Debugf("[ExecResize] resize got response: %v", msg)
return err
return v.client.ResizeConsoleWindow(ctx, execID, height, width)
}

// NetworkConnect connects to a network.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/opencontainers/runc v0.1.1 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47
github.com/prometheus/client_golang v1.7.1
github.com/sanity-io/litter v1.3.0
github.com/sethvargo/go-signalcontext v0.1.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01 h1:jwdXaoOwm2yG3GdFREt1qMWL9RrumHvcqQpgYieNM3s=
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
github.com/projecteru2/libyavirt v0.0.0-20201130080123-f664f4852f70 h1:wbULh6iiJ0WKxLYfEHdbIMSdBIxjQRFkR7e8eAh2fts=
github.com/projecteru2/libyavirt v0.0.0-20201130080123-f664f4852f70/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47 h1:UO7w6jA6QdSl1dxjje/SqomL38diAGymQ4SX6alQ6dA=
github.com/projecteru2/libyavirt v0.0.0-20201130082506-1a1e5c346f47/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
Expand Down