Re: [PATCH 01/12] Makefile: Add missing PESTO_HEADERS variable

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2861 bytes --]

On Wed, Jul 01, 2026 at 02:07:01AM +0200, Stefano Brivio wrote:
> On Fri, 26 Jun 2026 17:09:52 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
> 
> > In several places we use a PESTO_HEADERS variable, with all the headers
> > that we need to build the pesto binary.  However, we never define it.
> > This looks like an error introduced by a bad rebase of the series
> > introducing pesto before it was merged.
> 
> Oops, yes, I just found that in a patch reject file. And I just
> discovered that a Makefile variable that's not defined happily expands
> to nothing, I wasn't aware of that.

Yeah :/.  Classic gotcha.

> > It turns out the fact we didn't list the headers was the only reason we
> > weren't getting unusedStructMember cppcheck warnings for pesto as we
> > already do for passt and passt-repair.  So, reinstate that suppression for
> > pesto as well.
> > 
> > Fixes: 02236db32625 ("pesto: Introduce stub configuration tool")
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> >  Makefile | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index e8170e90..5ed0f702 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -55,6 +55,7 @@ PASST_HEADERS = arch.h arp.h bitmap.h checksum.h conf.h dhcp.h dhcpv6.h \
> >  	virtio.h vu_common.h
> >  QRAP_HEADERS = arp.h ip.h passt.h util.h
> >  PASST_REPAIR_HEADERS = linux_dep.h
> > +PESTO_HEADERS = bitmap.h common.h fwd_rule.h inany.h ip.h log.h pesto.h serialise.h
> >  
> >  C := \#include <sys/random.h>\nint main(){int a=getrandom(0, 0, 0);}
> >  ifeq ($(shell printf "$(C)" | $(CC) -S -xc - -o - >/dev/null 2>&1; echo $$?),0)
> > @@ -203,7 +204,8 @@ CPPCHECK_FLAGS = --std=c11 --error-exitcode=1 --enable=all --force	\
> >  	else								\
> >  		echo "";						\
> >  	fi)								\
> > -	--suppress=missingIncludeSystem
> > +	--suppress=missingIncludeSystem					\
> > +	--suppress=unusedStructMember
> >  
> >  cppcheck: passt.cppcheck passt-repair.cppcheck pesto.cppcheck
> >  
> > @@ -212,10 +214,8 @@ cppcheck: passt.cppcheck passt-repair.cppcheck pesto.cppcheck
> >  	$(CPPCHECK) $(CPPCHECK_FLAGS) $(BASE_CPPFLAGS) $^
> >  
> >  passt.cppcheck: BASE_CPPFLAGS += -UPESTO
> > -passt.cppcheck: CPPCHECK_FLAGS += --suppress=unusedStructMember
> >  passt.cppcheck: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h
> >  
> > -passt-repair.cppcheck: CPPCHECK_FLAGS += --suppress=unusedStructMember
> >  passt-repair.cppcheck: $(PASST_REPAIR_SRCS) $(PASST_REPAIR_HEADERS) seccomp_repair.h
> >  
> >  pesto.cppcheck: BASE_CPPFLAGS += -DPESTO
> 
> -- 
> Stefano
> 

-- 
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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]