Merge pull request #1350 from stgraber/main

Fix QEMU feature checks during startup
lxc · Nov 1, 2024 · 0282a23 · 0282a23
2 parents c31281e + e7b95ae
commit 0282a23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
@@ -8861,7 +8861,7 @@ func (d *qemu) checkFeatures(hostArch int, qemuPath string) (map[string]any, err
 
 		// Try and connect to QMP socket until cancelled.
 		for {
-			monitor, err = qmp.Connect(monitorPath.Name(), qemuSerialChardevName, nil, d.QMPLogFilePath())
+			monitor, err = qmp.Connect(monitorPath.Name(), qemuSerialChardevName, nil, "")
 			// QMP successfully connected or we have been cancelled.
 			if err == nil || ctx.Err() != nil {
 				break

diff --git a/internal/server/instance/drivers/qmp/monitor.go b/internal/server/instance/drivers/qmp/monitor.go
@@ -193,7 +193,7 @@ func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool) error {
 
 	var log *os.File
 	var err error
-	if logCommand {
+	if logCommand && m.logFile != "" {
 		log, err = os.OpenFile(m.logFile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
 		if err != nil {
 			return err