From patchwork Wed Nov 30 19:44:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9454817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8A9560585 for ; Wed, 30 Nov 2016 20:09:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC1272849F for ; Wed, 30 Nov 2016 20:09:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B02A8284A2; Wed, 30 Nov 2016 20:09:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6429C2849F for ; Wed, 30 Nov 2016 20:09:28 +0000 (UTC) Received: from localhost ([::1]:46182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCBC3-0006Ln-G5 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Nov 2016 15:09:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCAos-0003zS-BC for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCAoo-0001zV-J0 for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCAoo-0001yL-E2 for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:26 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B6CAC05AA63 for ; Wed, 30 Nov 2016 19:45:25 +0000 (UTC) Received: from red.redhat.com (ovpn-116-172.phx2.redhat.com [10.3.116.172]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAUJj2nS025934; Wed, 30 Nov 2016 14:45:24 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 30 Nov 2016 13:44:39 -0600 Message-Id: <1480535094-23831-22-git-send-email-eblake@redhat.com> In-Reply-To: <1480535094-23831-1-git-send-email-eblake@redhat.com> References: <1480535094-23831-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 30 Nov 2016 19:45:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 21/36] qtest: Avoid dynamic JSON in tmp105-test 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: pbonzini@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP As argued elsewhere, it's less code to maintain if we convert from a dynamic string passed to qobject_from_jsonv() to instead use a hand-built QDict. Signed-off-by: Eric Blake --- tests/tmp105-test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index a7940a4..7019445 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -80,9 +80,12 @@ static int qmp_tmp105_get_temperature(const char *id) static void qmp_tmp105_set_temperature(const char *id, int value) { QDict *response; + QDict *args = qdict_new(); - response = qmp("{ 'execute': 'qom-set', 'arguments': { 'path': %s, " - "'property': 'temperature', 'value': %d } }", id, value); + qdict_put_str(args, "path", id); + qdict_put_str(args, "property", "temperature"); + qdict_put_int(args, "value", value); + response = qmp_cmd("qom-set", args); g_assert(qdict_haskey(response, "return")); QDECREF(response); }