From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202510 header.b=rupyPIoS; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 7E0695A0619 for ; Sat, 11 Oct 2025 01:35:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1760139307; bh=Z8/QaiMPs63KVUgvSi7Bl6CV4SWK0zUk+NG+BgOrYzQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rupyPIoSxgLy1WcGxcZXsEN7udOjJlUUVa0+drdYNtdJpMlW5Ri63PZmTwzIWBX4n 2FTWFqGbJGGuxy8mWBDWG+upm7Q3CdCuYwQO8OzrLFeo+VIZtXniToSZfpKQkOU1KP tgcM2c0nRC/rRFjXOONT2jt2LFhEktWYkMV2xNfFVj2cluRMFDz14I9OjjDqZ89SBy wapTyfEO86wd3iAPr6SUFKSHenmAmUItjdeDAWpbIdvA9mYGG1vB8GjQbtHaQj0iW6 TFP/5ifSzYmCsntlM2JCC9suh52/VVs/KLZNwPJLBrb9ogLCqN0BkwJ+mGttO1MTXX 0AV84Wfg2JCAg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ck34q17NLz4wC6; Sat, 11 Oct 2025 10:35:07 +1100 (AEDT) Date: Sat, 11 Oct 2025 10:34:57 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v2] passt: Rename EPOLL_EVENTS to NUM_EPOLL_EVENTS Message-ID: References: <20251010084651.1426628-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="78xtsWdO4oxyY8kT" Content-Disposition: inline In-Reply-To: <20251010084651.1426628-1-lvivier@redhat.com> Message-ID-Hash: BLZB7B7JWJU3PKSIJHFVMRLTXSYFCF2G X-Message-ID-Hash: BLZB7B7JWJU3PKSIJHFVMRLTXSYFCF2G X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --78xtsWdO4oxyY8kT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 10, 2025 at 10:46:51AM +0200, Laurent Vivier wrote: > The macro EPOLL_EVENTS conflicts with enum EPOLL_EVENTS defined in > sys/epoll.h (glibc). >=20 > Rename the local macro to NUM_EPOLL_EVENTS to avoid this namespace > collision. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- >=20 > Notes: > v2: Rename PASST_EPOLL_EVENTS to NUM_EPOLL_EVENTS for better clarity >=20 > passt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/passt.c b/passt.c > index 31fbb75b1b12..bdb7b6935f0c 100644 > --- a/passt.c > +++ b/passt.c > @@ -54,7 +54,7 @@ > #include "migrate.h" > #include "repair.h" > =20 > -#define EPOLL_EVENTS 8 > +#define NUM_EPOLL_EVENTS 8 > =20 > #define TIMER_INTERVAL__ MIN(TCP_TIMER_INTERVAL, UDP_TIMER_INTERVAL) > #define TIMER_INTERVAL_ MIN(TIMER_INTERVAL__, ICMP_TIMER_INTERVAL) > @@ -245,7 +245,7 @@ static void print_stats(const struct ctx *c, const st= ruct passt_stats *stats, > */ > int main(int argc, char **argv) > { > - struct epoll_event events[EPOLL_EVENTS]; > + struct epoll_event events[NUM_EPOLL_EVENTS]; > struct passt_stats stats =3D { 0 }; > int nfds, i, devnull_fd =3D -1; > struct ctx c =3D { 0 }; > @@ -349,7 +349,7 @@ int main(int argc, char **argv) > loop: > /* NOLINTBEGIN(bugprone-branch-clone): intervals can be the same */ > /* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */ > - nfds =3D epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL); > + nfds =3D epoll_wait(c.epollfd, events, NUM_EPOLL_EVENTS, TIMER_INTERVAL= ); > /* NOLINTEND(bugprone-branch-clone) */ > if (nfds =3D=3D -1 && errno !=3D EINTR) > die_perror("epoll_wait() failed in main loop"); > --=20 > 2.50.1 >=20 --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --78xtsWdO4oxyY8kT Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmjpmBsACgkQzQJF27ox 2Gdx5hAAnmuUiBTIoCQA2yhhiNZ0Oi/fs8l1Vh1I86ATXm3OH2VxA8xhYt3X504v Ol+BXHvKPi13F6DJFELzYrR1WtjIYfb4OrignAQxXby5DCSGVYnuHs80WK8Nzf9u LZwaeqaTq+aZ/Hw3sOd7DygsGA07iKRS1XpHbZt/X59xkQXILItZ15zj6a6rCMVA +DWJe5hPRP0NI5hLh0Y1fy8fkZd8BYMW3Qt6mvpLvSWouj8OKlVR+BINyfutGc07 H9XPCVWUxyi3BPYwqgdNliNoZlpMW6aFYcqR5hFzCYxkPivmS6uHN+gWda0ZV3+U VJjFJekrFUz92pVv+7djcBdAdS3Z4Dx4V+7F19K5xFm01e6F0dBpGwMYf5Xd3Mio ygqRL1fW78hIiYfEZrRjcek4PEvjAuMzlRYmvD63U5ncYhfKk9rkyQvpti1G8PPD W1nBFBZcej1j4CXhiG/Xtxr5cJD7zKoDmt568YGx55QqzoVelV2ROVsMI+bBhLUn sJKmckIB1uHONLxJ9QRhZhrd6wZJlIUzPj6scabBL2x/IrI92xr6qTfp8bbBC7Dg 301CgYjN5t3L2XomnxbUTg6VBn5pz2bdEWNoKKhK9CFsVQovzvfGMd1UK6Pi0ow2 7ubXFGsKgLZGkjC7TUysTY0ZFudTd8QGmpVNmuIhH3zxFx+CvUI= =99dS -----END PGP SIGNATURE----- --78xtsWdO4oxyY8kT--