incusd/instance/qmp: Add command ID to RunJSON

Signed-off-by: JUN JIE NAN <nanjunjie@gmail.com>

Author: nanjj

internal/server/instance/drivers/driver_qemu.go

@@ -1221,8 +1221,17 @@ func (d *qemu) startupHook(monitor *qmp.Monitor, stage string) error {
 		}
 
 		for _, command := range commandList {
-			jsonCommand, _ := json.Marshal(command)
-			err = monitor.RunJSON(jsonCommand, nil, true)
+			id := monitor.IncreaseID()
+			command["id"] = id
+
+			var jsonCommand []byte
+			jsonCommand, err = json.Marshal(command)
+			if err != nil {
+				err = fmt.Errorf("Failed to marshal command at %s stage: %w", stage, err)
+				return err
+			}
+
+			err = monitor.RunJSON(jsonCommand, nil, true, id)
 			if err != nil {
 				err = fmt.Errorf("Failed to run QMP command %s at %s stage: %w", jsonCommand, stage, err)
 				return err

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

@@ -193,7 +193,7 @@ func (m *Monitor) ping() error {
 }
 
 // RunJSON executes a JSON-formatted command.
-func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool) error {
+func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool, id uint32) error {
 	// Check if disconnected
 	if m.disconnected {
 		return ErrMonitorDisconnect
@@ -215,7 +215,7 @@ func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool) error {
 		}
 	}
 
-	out, err := m.qmp.run(request, qmpZeroKey)
+	out, err := m.qmp.run(request, id)
 	if err != nil {
 		// Confirm the daemon didn't die.
 		errPing := m.ping()
@@ -250,13 +250,18 @@ func (m *Monitor) RunJSON(request []byte, resp any, logCommand bool) error {
 	return nil
 }
 
+// IncreaseID returns on auto increment uint32 id.
+func (m *Monitor) IncreaseID() uint32 {
+	return m.qmp.qmpIncreaseID()
+}
+
 // run executes a command.
 func (m *Monitor) Run(cmd string, args any, resp any) error {
+	id := m.IncreaseID()
+
 	// Construct the command.
-	requestArgs := struct {
-		Execute   string `json:"execute"`
-		Arguments any    `json:"arguments,omitempty"`
-	}{
+	requestArgs := qmpCommand{
+		ID:        id,
 		Execute:   cmd,
 		Arguments: args,
 	}
@@ -267,7 +272,7 @@ func (m *Monitor) Run(cmd string, args any, resp any) error {
 	}
 
 	logCommand := !slices.Contains(ExcludedCommands, cmd)
-	return m.RunJSON(request, resp, logCommand)
+	return m.RunJSON(request, resp, logCommand, id)
 }
 
 // Connect creates or retrieves an existing QMP monitor for the path.

internal/server/scriptlet/qemu.go

@@ -92,13 +92,21 @@ func QEMURun(l logger.Logger, instance *api.Instance, cmdArgs *[]string, conf *[
 			return nil, err
 		}
 
+		id := uint32(0)
+		req, ok := value.(map[string]any)
+		if ok {
+			id = m.IncreaseID()
+			req["id"] = id
+			value = req
+		}
+
 		request, err := json.Marshal(value)
 		if err != nil {
 			return nil, err
 		}
 
 		var resp map[string]any
-		err = m.RunJSON(request, &resp, true)
+		err = m.RunJSON(request, &resp, true, id)
 		if err != nil {
 			return nil, err
 		}