From nobody Tue Nov 4 19:05:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530549423037639.3105658120946; Mon, 2 Jul 2018 09:37:03 -0700 (PDT) Received: from localhost ([::1]:34164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa1p0-0006hk-8j for importer@patchew.org; Mon, 02 Jul 2018 12:37:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa1au-0004SO-9P for qemu-devel@nongnu.org; Mon, 02 Jul 2018 12:22:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa1ar-0006g3-Vy for qemu-devel@nongnu.org; Mon, 02 Jul 2018 12:22:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47594 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fa1ar-0006eq-Ii for qemu-devel@nongnu.org; Mon, 02 Jul 2018 12:22:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1638D7DAC2 for ; Mon, 2 Jul 2018 16:22:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DFB672026D6B; Mon, 2 Jul 2018 16:22:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D02A81132BC3; Mon, 2 Jul 2018 18:22:18 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 2 Jul 2018 18:22:11 +0200 Message-Id: <20180702162218.13678-26-armbru@redhat.com> In-Reply-To: <20180702162218.13678-1-armbru@redhat.com> References: <20180702162218.13678-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 02 Jul 2018 16:22:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 02 Jul 2018 16:22:25 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 25/32] qmp: Replace get_qmp_greeting() by qmp_greeting() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@redhat.com, peterx@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" get_qmp_greeting() returns a QDict * as QObject *. It's caller converts it right back. Return QDict * instead. While there, rename to qmp_greeting(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- monitor.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 399ad6b4e0..ba3124514c 100644 --- a/monitor.c +++ b/monitor.c @@ -4381,7 +4381,7 @@ void monitor_resume(Monitor *mon) trace_monitor_suspend(mon, -1); } =20 -static QObject *get_qmp_greeting(Monitor *mon) +static QDict *qmp_greeting(Monitor *mon) { QList *cap_list =3D qlist_new(); QObject *ver =3D NULL; @@ -4397,8 +4397,9 @@ static QObject *get_qmp_greeting(Monitor *mon) qlist_append_str(cap_list, QMPCapability_str(cap)); } =20 - return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': %p}= }", - ver, cap_list); + return qdict_from_jsonf_nofail( + "{'QMP': {'version': %p, 'capabilities': %p}}", + ver, cap_list); } =20 static void monitor_qmp_caps_reset(Monitor *mon) @@ -4408,15 +4409,15 @@ static void monitor_qmp_caps_reset(Monitor *mon) =20 static void monitor_qmp_event(void *opaque, int event) { - QObject *data; + QDict *data; Monitor *mon =3D opaque; =20 switch (event) { case CHR_EVENT_OPENED: mon->qmp.commands =3D &qmp_cap_negotiation_commands; monitor_qmp_caps_reset(mon); - data =3D get_qmp_greeting(mon); - qmp_queue_response(mon, qobject_to(QDict, data)); + data =3D qmp_greeting(mon); + qmp_queue_response(mon, data); qobject_unref(data); mon_refcount++; break; --=20 2.17.1