From nobody Sun May 5 01:32:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599075991; cv=none; d=zohomail.com; s=zohoarc; b=loHSnpnpZdMagugZY9w4fyWntcl1hecs4Qx8fgq9YO6jM7aGsibTk5vLb4uwgUW8b561ZCyinZwEPaRJSOqVQAqNOWb1VdmtO8n2XUR3kfJta6fJCfWPS+eE+TxMtq//3XGRO+i90KNainnxxwiCvLh4rREtcYTxwEVptfV/0TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599075991; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=T/qY8FgZKDIM3Cg9kmgGBHQ4IgSiKUjaCyEma9jhOGk=; b=PpZZaZORTkCUpiP1MWZ+EO06AxRWIhMwVDgR3A6eSvOowUNZHUuifIIm+sqSU9fHU+kSLSYi4jyYoZe7M4yjaTkfJNN/ZU2nLPlmSz8e6G8JKmoKC81iQisyXRtcu0ngrz02g5gua7OXKhOj69M93vmuWt2sn6wY27wtSaWu/Ng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 15990759916770.4046035666847274; Wed, 2 Sep 2020 12:46:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-Kcw27CmvMXKwR6Au0mB3mQ-1; Wed, 02 Sep 2020 15:46:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E25F93FF9; Wed, 2 Sep 2020 19:46:19 +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 45DA819C71; Wed, 2 Sep 2020 19:46:18 +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 A251D79DBC; Wed, 2 Sep 2020 19:46:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 082Jjgxc029675 for ; Wed, 2 Sep 2020 15:45:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 72A38196FB; Wed, 2 Sep 2020 19:45:42 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-112-89.phx2.redhat.com [10.3.112.89]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BDBA196F3 for ; Wed, 2 Sep 2020 19:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599075990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=T/qY8FgZKDIM3Cg9kmgGBHQ4IgSiKUjaCyEma9jhOGk=; b=dKxcMVJc9/1xn6mMXpdY+7QpqTJk5+gR07IsT4knKWkYg6KX51vdvU1Nff+x7BqPiNG+/N 0yACpcfBja8rtvx917w7HNWxw8fxkUokKe9i2AKAe72QqwRcpq6Y6gxhjTDhDNWrcjnJxC EelALy6YotgoGRdzgTBJiXAXUqDn7DQ= X-MC-Unique: Kcw27CmvMXKwR6Au0mB3mQ-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH] tests: change confusing macro agument names Date: Wed, 2 Sep 2020 14:45:38 -0500 Message-Id: <20200902194538.644086-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Rather than use the names "fial" and "kep", use "fail" and "keep". In the DO_TEST() macro, to prevent the preprocessor replacing the struct member names during assignment, use the names "fail_" and "keep_" instead. Signed-off-by: Jonathon Jongsma Reviewed-by: Laine Stump --- tests/qemuhotplugtest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 1e18820a2b..b023c49a69 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -641,28 +641,28 @@ mymain(void) } =20 =20 -#define DO_TEST(file, ACTION, dev, fial, kep, ...) \ +#define DO_TEST(file, ACTION, dev, fail_, keep_, ...) \ do { \ const char *my_mon[] =3D { __VA_ARGS__, NULL}; \ const char *name =3D file " " #ACTION " " dev; \ data.action =3D ACTION; \ data.domain_filename =3D file; \ data.device_filename =3D dev; \ - data.fail =3D fial; \ + data.fail =3D fail_; \ data.mon =3D my_mon; \ - data.keep =3D kep; \ + data.keep =3D keep_; \ if (virTestRun(name, testQemuHotplug, &data) < 0) \ ret =3D -1; \ } while (0) =20 -#define DO_TEST_ATTACH(file, dev, fial, kep, ...) \ - DO_TEST(file, ATTACH, dev, fial, kep, __VA_ARGS__) +#define DO_TEST_ATTACH(file, dev, fail, keep, ...) \ + DO_TEST(file, ATTACH, dev, fail, keep, __VA_ARGS__) =20 -#define DO_TEST_DETACH(file, dev, fial, kep, ...) \ - DO_TEST(file, DETACH, dev, fial, kep, __VA_ARGS__) +#define DO_TEST_DETACH(file, dev, fail, keep, ...) \ + DO_TEST(file, DETACH, dev, fail, keep, __VA_ARGS__) =20 -#define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ - DO_TEST(file, UPDATE, dev, fial, kep, __VA_ARGS__) +#define DO_TEST_UPDATE(file, dev, fail, keep, ...) \ + DO_TEST(file, UPDATE, dev, fail, keep, __VA_ARGS__) =20 =20 #define QMP_OK "{\"return\": {}}" --=20 2.26.2