From patchwork Mon Dec 6 18:24:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3741FB70CD for ; Tue, 7 Dec 2010 05:52:09 +1100 (EST) Received: from localhost ([127.0.0.1]:43750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPgAQ-0000HC-Ou for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:52:06 -0500 Received: from [140.186.70.92] (port=36228 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfk9-0003NI-JC for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfk8-0004Hx-PW for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfk8-0004Hg-JG for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:56 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOtp4012763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:56 -0500 Received: from localhost ([10.3.113.17]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6IOsgq004937; Mon, 6 Dec 2010 13:24:55 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:24:09 -0200 Message-Id: <1291659852-23028-23-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> References: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 22/25] Monitor: qmp_query_migrate(): Return {} for empty MigrationState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When no migration has been performed (ie. empty MigrationState), qmp_query_migrate() returns nothing. Let's do what other query handlers do: return an empty json-object. Signed-off-by: Luiz Capitulino --- migration.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/migration.c b/migration.c index 923d20e..ed253af 100644 --- a/migration.c +++ b/migration.c @@ -192,6 +192,9 @@ void do_info_migrate_print(Monitor *mon, const QObject *data) QDict *qdict; qdict = qobject_to_qdict(data); + if (qdict_size(qdict) == 0) { + return; + } monitor_printf(mon, "Migration status: %s\n", qdict_get_str(qdict, "status")); @@ -248,6 +251,8 @@ void qmp_query_migrate(Monitor *mon, QObject **ret_data) *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }"); break; } + } else { + *ret_data = qobject_from_jsonf("{}"); } }