github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-22 13:38:26 +00:00
Code Issues Projects Releases Wiki Activity

qmp: Output error detail when execute QMP command failed

Browse Source 
Only get 'QMP command failed' error message now when execute QMP
command by 'executeCommandWithResponse' failed. This patch will
output more error detail.

Signed-off-by: NingBo <ning.bo9@zte.com.cn>
This commit is contained in:
NingBo 2018-11-29 16:20:03 +08:00
parent 99e0358ba9
commit f30fd1354a
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qemu/qmp.go
View File

@ -313,7 +313,7 @@ func (q *QMP) finaliseCommandWithResponse(cmdEl *list.Element, cmdQueue *list.Li
if succeeded { if succeeded {
cmd.res <- qmpResult{response: response} cmd.res <- qmpResult{response: response}
} else { } else {
cmd.res <- qmpResult{err: fmt.Errorf("QMP command failed")} cmd.res <- qmpResult{err: fmt.Errorf("QMP command failed: %v", response)}
} }
} }
if cmdQueue.Len() > 0 { if cmdQueue.Len() > 0 {
@ -325,6 +325,23 @@ func (q *QMP) finaliseCommand(cmdEl *list.Element, cmdQueue *list.List, succeede
q.finaliseCommandWithResponse(cmdEl, cmdQueue, succeeded, nil) q.finaliseCommandWithResponse(cmdEl, cmdQueue, succeeded, nil)
} }
func (q *QMP) errorDesc(errorData interface{}) (string, error) {
// convert error to json
data, err := json.Marshal(errorData)
if err != nil {
return "", fmt.Errorf("Unable to extract error information: %v", err)
}
// see: https://github.com/qemu/qemu/blob/stable-2.12/qapi/qmp-dispatch.c#L125
var qmpErr map[string]string
// convert json to qmpError
if err = json.Unmarshal(data, &qmpErr); err != nil {
return "", fmt.Errorf("Unable to convert json to qmpError: %v", err)
}
return qmpErr["desc"], nil
}
func (q *QMP) processQMPInput(line []byte, cmdQueue *list.List) { func (q *QMP) processQMPInput(line []byte, cmdQueue *list.List) {
var vmData map[string]interface{} var vmData map[string]interface{}
err := json.Unmarshal(line, &vmData) err := json.Unmarshal(line, &vmData)
@ -339,7 +356,7 @@ func (q *QMP) processQMPInput(line []byte, cmdQueue *list.List) {
} }
response, succeeded := vmData["return"] response, succeeded := vmData["return"]
_, failed := vmData["error"] errData, failed := vmData["error"]
if !succeeded && !failed { if !succeeded && !failed {
return return
@ -353,6 +370,14 @@ func (q *QMP) processQMPInput(line []byte, cmdQueue *list.List) {
} }
cmd := cmdEl.Value.(*qmpCommand) cmd := cmdEl.Value.(*qmpCommand)
if failed || cmd.filter == nil { if failed || cmd.filter == nil {
if errData != nil {
desc, err := q.errorDesc(errData)
if err != nil {
q.cfg.Logger.Infof("Get error description failed: %v", err)
} else {
response = desc
}
}
q.finaliseCommandWithResponse(cmdEl, cmdQueue, succeeded, response) q.finaliseCommandWithResponse(cmdEl, cmdQueue, succeeded, response)
} else { } else {
cmd.resultReceived = true cmd.resultReceived = true