From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FIGR+WBf; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id B4E935A0619 for ; Fri, 10 Oct 2025 10:02:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760083352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=cdJrtucllfjNwyLOXaQbkNhSvvbktml8LynOZq0cx4w=; b=FIGR+WBfWfkfe/1FZe2dvL4iwBcEBlouBx5zAbqrxAGND+3VFzYGMKBQ6HFOPbtm3DdLB2 dWSVK6rKdxNxgRAwV0+GFHw3xK5tq/u32Pe3QPW6XB/N1QnG3EpiZAvZffkXnFHA47EM5x iA8qtijwsOnSmPz2claXH8LrirDZ46g= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-DXuCKJWQMcCB69f3_ZK8PQ-1; Fri, 10 Oct 2025 04:02:31 -0400 X-MC-Unique: DXuCKJWQMcCB69f3_ZK8PQ-1 X-Mimecast-MFC-AGG-ID: DXuCKJWQMcCB69f3_ZK8PQ_1760083349 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3f924ae2a89so1904911f8f.3 for ; Fri, 10 Oct 2025 01:02:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760083349; x=1760688149; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cdJrtucllfjNwyLOXaQbkNhSvvbktml8LynOZq0cx4w=; b=C3bgos4DxPWyRG7H2IAspvLTuNlMHMUf7bjv9XJhGf630lDO6iINv6G+ISBOSQdf0d Q6/CP0P2FqPMiwPUpF6fXFhrBXbP/UGhCaUEkW+32w8dnad9lBF7O5JEX5WoA0CoKuXE qsxYkAWigwNBklikzC78SGsqsaktgZaKDhjF524WFNtYuC84r3vg7vkzokIiHRo6GsQ4 MmCPwG66cvwaG9i58RRykLRL6wEt1LZi/0XiA8Z4oDSbUBmjtLEBF7ITnPHr06Zb833z NUIvnop1peQgpRmdAeI4nYeChEVTm35tHRmIFGCkCiVB/IXdyiRx5cdWuXoC8dn8GsJB 38Ug== X-Gm-Message-State: AOJu0YztmwRhi9LwCZlaEqpb1rRBVhgrRD6wXAEGryqrQJIbfj5zKGPO Or7zywrAjoCcIe72BE/NxI9ccyOsEL+XnWI+k5MOfzx0INiiJkq4qjrjhirN8IUNsU/EDwOysck +3eZBpZZOSkOMrKo8g/Adz44oftizeMHTupnO12nDa0E39KF/+Fipfhr1R/8Fbw== X-Gm-Gg: ASbGncukljek38+bL18ARmwO2Baw7v/042kYG/zRWu4xnzN/ps4FpKf07q8iKd8KXtN DMASAbOa8hBuCdv72LwY/nWpR/pQkxXFVMczA99XrZ15PTAyaJcpZG6ftCJ87/YUStwQrtfAH/r DYUPx8kNxscYi5ePrkY10kXzXPeBH3ACdpJxWOMRraMBWe+ZIMKRqbJ2Xl++h0YVULx833MaMGt CGnzmotFxaNX68OL4g4Y+rj0MWSNFnVNLaRh5qjYiI3SpgN/pVpPhMPr4Qrj9NUb0Vgj+gZp9QV zBNuXh79dvAyR6Oqo0PqUVL1OLT6S7jhaZBxcm29u0Y+izk+11VbENLnpP6jRO5QCwlSFF8Htz2 Vsx0= X-Received: by 2002:a05:6000:401f:b0:3e9:a1cb:ea8f with SMTP id ffacd0b85a97d-4267260e2famr7489632f8f.52.1760083348598; Fri, 10 Oct 2025 01:02:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwEoTfhCo2QTT6qa8Kdi63qLMPQcaG9eRnapjEdvuus27oZxn8Gxzz8/Q4OXYRzYa/vafypg== X-Received: by 2002:a05:6000:401f:b0:3e9:a1cb:ea8f with SMTP id ffacd0b85a97d-4267260e2famr7489610f8f.52.1760083348203; Fri, 10 Oct 2025 01:02:28 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e10:ef90:343a:68f:2e91:95c? ([2a01:e0a:e10:ef90:343a:68f:2e91:95c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce583424sm2869741f8f.21.2025.10.10.01.02.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Oct 2025 01:02:27 -0700 (PDT) Message-ID: <33813f1d-d7d2-49e6-9d6a-127d75681507@redhat.com> Date: Fri, 10 Oct 2025 10:02:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] passt: Rename EPOLL_EVENTS to PASST_EPOLL_EVENTS To: David Gibson References: <20251009143229.103983-1-lvivier@redhat.com> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: j7OUMJ0f8_fAROI1N-Aygpo7wPl_qfrIQESuVux-qno_1760083349 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: 3JXMYQTXSZDBJR2F2E5ZFEHEYU6AVSL3 X-Message-ID-Hash: 3JXMYQTXSZDBJR2F2E5ZFEHEYU6AVSL3 X-MailFrom: lvivier@redhat.com 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: On 10/10/2025 09:46, David Gibson wrote: > On Thu, Oct 09, 2025 at 04:32:29PM +0200, Laurent Vivier wrote: >> The macro EPOLL_EVENTS conflicts with enum EPOLL_EVENTS defined in >> sys/epoll.h (glibc). >> >> Rename the local macro to PASST_EPOLL_EVENTS to avoid this namespace >> collision. > > Maybe "NUM_EPOLL_EVENTS" since this also has an entirely unrelated > meaning to the libc enum. I update the patch. Thanks, Laurent > >> >> Signed-off-by: Laurent Vivier >> --- >> passt.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/passt.c b/passt.c >> index 31fbb75b1b12..8307e0057360 100644 >> --- a/passt.c >> +++ b/passt.c >> @@ -54,7 +54,7 @@ >> #include "migrate.h" >> #include "repair.h" >> >> -#define EPOLL_EVENTS 8 >> +#define PASST_EPOLL_EVENTS 8 >> >> #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 struct passt_stats *stats, >> */ >> int main(int argc, char **argv) >> { >> - struct epoll_event events[EPOLL_EVENTS]; >> + struct epoll_event events[PASST_EPOLL_EVENTS]; >> struct passt_stats stats = { 0 }; >> int nfds, i, devnull_fd = -1; >> struct ctx c = { 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 = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL); >> + nfds = epoll_wait(c.epollfd, events, PASST_EPOLL_EVENTS, TIMER_INTERVAL); >> /* NOLINTEND(bugprone-branch-clone) */ >> if (nfds == -1 && errno != EINTR) >> die_perror("epoll_wait() failed in main loop"); >> -- >> 2.50.1 >> >