fix(host): parse qga command and args (#20505)

yunionio · Jun 7, 2024 · cdd5977 · cdd5977
1 parent c9c2b27
commit cdd5977
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/pkg/hostman/guestman/guesthandlers/guesthandler.go b/pkg/hostman/guestman/guesthandlers/guesthandler.go
@@ -909,11 +909,13 @@ func qgaCommand(ctx context.Context, userCred mcclient.TokenCredential, sid stri
 		return nil, httperrors.NewInputParameterError("failed parse qga command")
 	}
 	qgaCmd := &monitor.Command{}
-	err = cmdJson.Unmarshal(qgaCmd)
+	qgaCmd.Execute, err = cmdJson.GetString("execute")
 	if err != nil {
-		return nil, httperrors.NewInputParameterError("failed unmarshal qga command")
+		return nil, httperrors.NewInputParameterError("failed get qga command")
+	}
+	if cmdJson.Contains("arguments") {
+		qgaCmd.Args, _ = cmdJson.Get("arguments")
 	}
-
 	return gm.QgaCommand(qgaCmd, sid, input.Timeout)
 }
 

diff --git a/pkg/hostman/monitor/qga/qga.go b/pkg/hostman/monitor/qga/qga.go
@@ -27,6 +27,7 @@ import (
 	"time"
 	"unsafe"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 
@@ -171,12 +172,8 @@ func (qga *QemuGuestAgent) execCmd(cmd *monitor.Command, expectResp bool, readTi
 		}
 	}
 
-	rawCmd, err := json.Marshal(cmd)
-	if err != nil {
-		return nil, errors.Wrap(err, "marshal qga cmd")
-	}
-
-	err = qga.write(rawCmd)
+	rawCmd := jsonutils.Marshal(cmd).String()
+	err := qga.write([]byte(rawCmd))
 	if err != nil {
 		return nil, errors.Wrap(err, "write cmd")
 	}