Skip to content

Commit 940a2f8

Browse files
committed
Bind QEMU GA socket only in virtio mode
Signed-off-by: Arthur Sengileyev <[email protected]>
1 parent 377c1f7 commit 940a2f8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

pkg/qemu/qemu.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ type Config struct {
4545
LimaYAML *limayaml.LimaYAML
4646
SSHLocalPort int
4747
SSHAddress string
48+
VirtioGA bool
4849
}
4950

5051
// MinimumQemuVersion is the minimum supported QEMU version.
@@ -987,11 +988,13 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
987988
args = append(args, "-chardev", fmt.Sprintf("socket,id=%s,path=%s,server=on,wait=off", qmpChardev, qmpSock))
988989
args = append(args, "-qmp", "chardev:"+qmpChardev)
989990

990-
// Guest agent via serialport
991-
guestSock := filepath.Join(cfg.InstanceDir, filenames.GuestAgentSock)
992-
args = append(args, "-chardev", fmt.Sprintf("socket,path=%s,server=on,wait=off,id=qga0", guestSock))
993-
args = append(args, "-device", "virtio-serial")
994-
args = append(args, "-device", "virtserialport,chardev=qga0,name="+filenames.VirtioPort)
991+
if cfg.VirtioGA {
992+
// Guest agent via serialport
993+
guestSock := filepath.Join(cfg.InstanceDir, filenames.GuestAgentSock)
994+
args = append(args, "-chardev", fmt.Sprintf("socket,path=%s,server=on,wait=off,id=qga0", guestSock))
995+
args = append(args, "-device", "virtio-serial")
996+
args = append(args, "-device", "virtserialport,chardev=qga0,name="+filenames.VirtioPort)
997+
}
995998

996999
// QEMU process
9971000
args = append(args, "-name", "lima-"+cfg.Name)

pkg/qemu/qemu_driver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ func (l *LimaQemuDriver) Start(ctx context.Context) (chan error, error) {
7777
LimaYAML: l.Instance.Config,
7878
SSHLocalPort: l.SSHLocalPort,
7979
SSHAddress: l.Instance.SSHAddress,
80+
VirtioGA: l.VirtioPort != "",
8081
}
8182
qExe, qArgs, err := Cmdline(ctx, qCfg)
8283
if err != nil {

0 commit comments

Comments
 (0)