Skip to content

Commit 0282a23

Browse files
authored
Merge pull request #1350 from stgraber/main
Fix QEMU feature checks during startup
2 parents c31281e + e7b95ae commit 0282a23

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

internal/server/instance/drivers/driver_qemu.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8861,7 +8861,7 @@ func (d *qemu) checkFeatures(hostArch int, qemuPath string) (map[string]any, err
88618861

88628862
// Try and connect to QMP socket until cancelled.
88638863
for {
8864-
monitor, err = qmp.Connect(monitorPath.Name(), qemuSerialChardevName, nil, d.QMPLogFilePath())
8864+
monitor, err = qmp.Connect(monitorPath.Name(), qemuSerialChardevName, nil, "")
88658865
// QMP successfully connected or we have been cancelled.
88668866
if err == nil || ctx.Err() != nil {
88678867
break

internal/server/instance/drivers/qmp/monitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool) error {
193193

194194
var log *os.File
195195
var err error
196-
if logCommand {
196+
if logCommand && m.logFile != "" {
197197
log, err = os.OpenFile(m.logFile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
198198
if err != nil {
199199
return err

0 commit comments

Comments
 (0)