On 03/25/2011 02:47 PM, Michael Roth wrote:
Async commands like 'guest-ping' have NULL retvals. Handle these by
inserting an empty dictionary in the response's "return" field.
Signed-off-by: Michael Roth<mdr...@linux.vnet.ibm.com>
---
qmp-core.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/qmp-core.c b/qmp-core.c
index e33f7a4..9f3d182 100644
--- a/qmp-core.c
+++ b/qmp-core.c
@@ -922,9 +922,12 @@ void qmp_async_complete_command(QmpCommandState *cmd,
QObject *retval, Error *er
rsp = qdict_new();
if (err) {
qdict_put_obj(rsp, "error", error_get_qobject(err));
- } else {
+ } else if (retval) {
qobject_incref(retval);
qdict_put_obj(rsp, "return", retval);
+ } else {
+ /* add empty "return" dict, this is the standard for NULL returns */
+ qdict_put_obj(rsp, "return", QOBJECT(qdict_new()));
Luiz, I know we decided to return empty dicts because it lets us extend
things better, but did we want to rule out the use of a 'null' return
value entirely?
For a command like this, I can't imagine ever wanting to extend the
return value...
Regards,
Anthony Liguori
}
if (cmd->tag) {
qdict_put_obj(rsp, "tag", cmd->tag);
