From nobody Fri Dec 19 19:14:24 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 1501810327885760.6446872932725; Thu, 3 Aug 2017 18:32:07 -0700 (PDT) Received: from localhost ([::1]:43456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddRTC-00043o-Eh for importer@patchew.org; Thu, 03 Aug 2017 21:32:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddRNN-0008H2-DK for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddRNM-0003pV-Gz for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddRNM-0003on-Bf for qemu-devel@nongnu.org; Thu, 03 Aug 2017 21:26:04 -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 5F1D8C047B6E for ; Fri, 4 Aug 2017 01:26:03 +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 DA2E361F36; Fri, 4 Aug 2017 01:26:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5F1D8C047B6E 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:33 -0500 Message-Id: <20170804012551.2714-5-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:03 +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 04/22] tests: Add assertion for no qmp("") 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" Now that the previous patches have fixed all callers to avoid an empty message, we can tweak qmp_fd_sendv() to assert that we don't introduce new callers, and reindent accordingly. The additional assertions will also help verify that later refactoring is not breaking anything. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster --- tests/libqtest.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 7e5425d704..99a07c246f 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -450,6 +450,9 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap) { va_list ap_copy; QObject *qobj; + int log =3D getenv("QTEST_LOG") !=3D NULL; + QString *qstr; + const char *str; /* qobject_from_jsonv() silently eats leading 0xff as invalid * JSON, but we want to test sending them over the wire to force @@ -458,6 +461,7 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap) socket_send(fd, fmt, 1); fmt++; } + assert(*fmt); /* Going through qobject ensures we escape strings properly. * This seemingly unnecessary copy is required in case va_list @@ -466,29 +470,23 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap) va_copy(ap_copy, ap); qobj =3D qobject_from_jsonv(fmt, &ap_copy, &error_abort); va_end(ap_copy); + qstr =3D qobject_to_json(qobj); - /* No need to send anything for an empty QObject. */ - if (qobj) { - int log =3D getenv("QTEST_LOG") !=3D NULL; - QString *qstr =3D qobject_to_json(qobj); - const char *str; + /* + * BUG: QMP doesn't react to input until it sees a newline, an + * object, or an array. Work-around: give it a newline. + */ + qstring_append_chr(qstr, '\n'); + str =3D qstring_get_str(qstr); - /* - * BUG: QMP doesn't react to input until it sees a newline, an - * object, or an array. Work-around: give it a newline. - */ - qstring_append_chr(qstr, '\n'); - str =3D qstring_get_str(qstr); - - if (log) { - fprintf(stderr, "%s", str); - } - /* Send QMP request */ - socket_send(fd, str, qstring_get_length(qstr)); - - QDECREF(qstr); - qobject_decref(qobj); + if (log) { + fprintf(stderr, "%s", str); } + /* Send QMP request */ + socket_send(fd, str, qstring_get_length(qstr)); + + QDECREF(qstr); + qobject_decref(qobj); } void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap) --=20 2.13.3