[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/3] tools/libxentoolcore: Fill in LIBHEADERS


  • To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Fri, 5 Mar 2021 12:49:47 +0000
  • Authentication-results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Juergen Gross <jgross@xxxxxxxx>
  • Delivery-date: Fri, 05 Mar 2021 12:50:15 +0000
  • Ironport-sdr: zV1m6LxsVZsEQc4Xjcsct9N3n2ffybb6svSYUFZtgaPA2rMjfLg6YhZ4XBM+FkVxsqci7+wO5Y t8BH7KDyoOPEHKDSUWikshYRvNwurdLFjOi8xAUn4wQoUge+ZbhbkFOHWx1OVPvIch69ZrBLuB ugJFKIupiREzsfdqHfHEfZ5ZTRePtlhwz+zvpoOSOinxMo3v1wmSpZml7wCr85XpT9ZkwKOIuu 0GieGKmwyG0h0ORXNaRhoxF+3a33NIxg1MLlqJ+iou7kYGt+UEVK9fQpVAiCueLiWSzk+GmDXB 7WY=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

c/s 4664034cd replaced a glob over include/*.h with an expectation that
LIBHEADER was suitably set for libraries which didn't have a single,
consistently named, header file.

This wasn't true for xentoolcore, which lost xentoolcore_internal.h as a
consequence, and failed an API/ABI check vs 4.14

Fixes: 4664034cd ("tools/libs: move official headers to common directory")
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Ian Jackson <iwj@xxxxxxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Juergen Gross <jgross@xxxxxxxx>

For 4.15.  This is a regression from 4.14, even if AFAICT it only impacts the
ABI checking at this point.

I *think* this is the only impacted library, but I would appreciate a second
pair of eyes.

I did experiment with this:

  +ifeq ($(LIBHEADER),)
  +$(warning $(LIBNAME) - No headers)
  +endif
   LIBHEADER ?= $(LIB_FILE_NAME).h
   LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h))

which yields:

  andrewcoop@andrewcoop:/local/xen.git$ make -j4 -s -C tools/libs/
  /local/xen.git/tools/libs/toollog/../../../tools/libs/libs.mk:50: toollog - 
No headers
  /local/xen.git/tools/libs/evtchn/../../../tools/libs/libs.mk:50: evtchn - No 
headers
  /local/xen.git/tools/libs/gnttab/../../../tools/libs/libs.mk:50: gnttab - No 
headers
  /local/xen.git/tools/libs/call/../../../tools/libs/libs.mk:50: call - No 
headers
  /local/xen.git/tools/libs/foreignmemory/../../../tools/libs/libs.mk:50: 
foreignmemory - No headers
  /local/xen.git/tools/libs/devicemodel/../../../tools/libs/libs.mk:50: 
devicemodel - No headers
  ../libs.mk:50: hypfs - No headers
  /local/xen.git/tools/libs/stat/../../../tools/libs/libs.mk:50: stat - No 
headers
  /local/xen.git/tools/libs/stat/../../../tools/libs/libs.mk:50: stat - No 
headers

Headers aside for a moment, there are two bugs here.  hypfs doesn't use the
same include pattern as the others, and stat is entered twice.
---
 tools/libs/toolcore/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile
index 1cf30733c9..3550786491 100644
--- a/tools/libs/toolcore/Makefile
+++ b/tools/libs/toolcore/Makefile
@@ -5,6 +5,8 @@ MAJOR   = 1
 MINOR  = 0
 AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h
 
+LIBHEADER := xentoolcore.h xentoolcore_internal.h
+
 SRCS-y += handlereg.c
 
 include $(XEN_ROOT)/tools/libs/libs.mk
-- 
2.11.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.