From nobody Thu May 15 06:32:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509055464588711.0795143685821; Thu, 26 Oct 2017 15:04:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E490B883BF; Thu, 26 Oct 2017 22:04:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC1405D743; Thu, 26 Oct 2017 22:04:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 871086EF2A; Thu, 26 Oct 2017 22:04:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9QM4CRs031981 for ; Thu, 26 Oct 2017 18:04:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E51C1899C; Thu, 26 Oct 2017 22:04:12 +0000 (UTC) Received: from mamuti.net (ovpn-204-16.brq.redhat.com [10.40.204.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99C8F5B839 for ; Thu, 26 Oct 2017 22:04:09 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 8C3D7101491; Fri, 27 Oct 2017 00:04:02 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E490B883BF Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 27 Oct 2017 00:03:56 +0200 Message-Id: <0d8dc8fe6684b07262d8da36098c6274bea221e3.1509052291.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/12] qemumonitorjsontest: Rename 1st CHECK macro in migration params test X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 26 Oct 2017 22:04:23 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The first CHECK macro in the test is used for checking integer values. Let's make it a bit more generic to be usable for any numeric type and use it for a new CHECK_INT macro. Signed-off-by: Jiri Denemark --- tests/qemumonitorjsontest.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 4d3b738e5..1dcff6672 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1813,7 +1813,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationParams(= const void *data) ¶ms) < 0) goto cleanup; =20 -#define CHECK(VAR, FIELD, VALUE) = \ +#define CHECK_NUM(VAR, FIELD, VALUE, FMT) = \ do { = \ if (!params.VAR ## _set) { = \ virReportError(VIR_ERR_INTERNAL_ERROR, "%s is not set", FIELD)= ; \ @@ -1821,19 +1821,23 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationParam= s(const void *data) } = \ if (params.VAR !=3D VALUE) { = \ virReportError(VIR_ERR_INTERNAL_ERROR, = \ - "Invalid %s: %d, expected %d", = \ + "Invalid %s: " FMT ", expected " FMT, = \ FIELD, params.VAR, VALUE); = \ goto cleanup; = \ } = \ } while (0) =20 - CHECK(compressLevel, "compress-level", 1); - CHECK(compressThreads, "compress-threads", 8); - CHECK(decompressThreads, "decompress-threads", 2); - CHECK(cpuThrottleInitial, "cpu-throttle-initial", 20); - CHECK(cpuThrottleIncrement, "cpu-throttle-increment", 10); +#define CHECK_INT(VAR, FIELD, VALUE) = \ + CHECK_NUM(VAR, FIELD, VALUE, "%d") =20 -#undef CHECK + CHECK_INT(compressLevel, "compress-level", 1); + CHECK_INT(compressThreads, "compress-threads", 8); + CHECK_INT(decompressThreads, "decompress-threads", 2); + CHECK_INT(cpuThrottleInitial, "cpu-throttle-initial", 20); + CHECK_INT(cpuThrottleIncrement, "cpu-throttle-increment", 10); + +#undef CHECK_NUM +#undef CHECK_INT =20 #define CHECK(VAR, FIELD, VALUE) = \ do { = \ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list