From nobody Fri Dec 19 17:42:08 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150181078060064.34233801453752; Thu, 3 Aug 2017 18:39:40 -0700 (PDT) Received: from localhost ([::1]:43504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddRaV-0001CY-6s for importer@patchew.org; Thu, 03 Aug 2017 21:39:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddRNS-0008Kx-DC for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddRNR-0003vM-Ft for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46638) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddRNR-0003uF-8g for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44FD8C04B30E for ; Fri, 4 Aug 2017 01:26:08 +0000 (UTC) Received: from red.redhat.com (ovpn-121-23.rdu2.redhat.com [10.10.121.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD78A61F36; Fri, 4 Aug 2017 01:26:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 44FD8C04B30E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 20:25:39 -0500 Message-Id: <20170804012551.2714-11-eblake@redhat.com> In-Reply-To: <20170804012551.2714-1-eblake@redhat.com> References: <20170804012551.2714-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 04 Aug 2017 01:26:08 +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 v4 10/22] libqtest: Skip round-trip through QObject 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: armbru@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" When we don't have to do any % interpolation in qmp() and friends, there is no point wasting time allocating a QObject from the format string only to then format it back into the string we send over the wire. This is a temporary measure: it becomes important in the next patch, where test-qga will be refactored to do interpolation in place, and where we must not re-interpolate the string; but will go away when further refactoring makes it easier to directly output a string without going through qmp_fd_sendv(). Signed-off-by: Eric Blake --- tests/libqtest.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index cde737ec5a..0cb439eefa 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -448,7 +448,7 @@ QDict *qtest_qmp_receive(QTestState *s) */ void qmp_fd_sendv(int fd, const char *fmt, va_list ap) { - QObject *qobj; + QObject *qobj =3D NULL; int log =3D getenv("QTEST_LOG") !=3D NULL; QString *qstr; const char *str; @@ -462,9 +462,17 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap) } assert(*fmt); - /* Going through qobject ensures we escape strings properly. */ - qobj =3D qobject_from_jsonv(fmt, ap); - qstr =3D qobject_to_json(qobj); + /* + * A round trip through QObject is only needed if % interpolation + * is used. We interpolate through QObject rather than sprintf in + * order to escape strings properly. + */ + if (strchr(fmt, '%')) { + qobj =3D qobject_from_jsonv(fmt, ap); + qstr =3D qobject_to_json(qobj); + } else { + qstr =3D qstring_from_str(fmt); + } /* * BUG: QMP doesn't react to input until it sees a newline, an --=20 2.13.3