Skip to contentSkip to conversation

tools/include: drop leading underscore from xen_list header

PATCH In review Roger Pau Monne 2 participants 2 messages Jun 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/include: drop leading underscore from xen_list header

A leading underscore is used to indicate auto generated headers, and the clean use of 'rm -f _*.h' will remove those. _xen_list.h also uses a leading underscore, but is checked in the repo and as such cannot be removed as part of the clean rule.

Fix this by dropping the leading underscore, so that the header is not removed.

Fixes a03b3552d4 ('libs,tools/include: Clean "clean" targets')
---
 tools/include/Makefile                    | 4 ++--
 tools/include/libxl.h                     | 2 +-
 tools/include/{_xen_list.h => xen_list.h} | 0
 tools/include/xentoolcore_internal.h      | 2 +-
 tools/libs/evtchn/minios.c                | 2 +-
 tools/libs/light/libxl_qmp.c              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tools/include/{_xen_list.h => xen_list.h} (100%)
tools/include/Makefile +2 -2
index 3a03a0b0fa..b488f7ca9f 100644
@@ -70,13 +70,13 @@ install: all
 	$(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io
 	$(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys
 	$(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(includedir)/xen/xsm
-	$(INSTALL_DATA) _xen_list.h $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) xen_list.h $(DESTDIR)$(includedir)
 
 .PHONY: uninstall
 uninstall:
 	echo "[FIXME] uninstall headers"
 	rm -rf $(DESTDIR)$(includedir)/xen
-	rm -f $(DESTDIR)$(includedir)/_xen_list.h
+	rm -f $(DESTDIR)$(includedir)/xen_list.h
 
 .PHONY: clean
 clean:
tools/include/libxl.h +1 -1
index 51a9b6cfac..7ce978e83c 100644
@@ -747,7 +747,7 @@
 typedef struct libxl__ctx libxl_ctx;
 
 #include <libxl_uuid.h>
-#include <_xen_list.h>
+#include <xen_list.h>
 
 /* API compatibility. */
 #ifdef LIBXL_API_VERSION
tools/include/xen_list.h renamed from tools/include/_xen_list.h +0 -0
similarity index 100%
rename from tools/include/_xen_list.h
rename to tools/include/xen_list.h
tools/include/xentoolcore_internal.h +1 -1
index deccefd612..1be014434d 100644
@@ -27,7 +27,7 @@
 #include <stddef.h>
 
 #include "xentoolcore.h"
-#include "_xen_list.h"
+#include "xen_list.h"
 
 /*---------- active handle registration ----------*/
 
tools/libs/evtchn/minios.c +1 -1
index 8ff46de884..28743cb055 100644
@@ -20,7 +20,7 @@
  * Split off from xc_minios.c
  */
 
-#include "_xen_list.h"
+#include "xen_list.h"
 #include <mini-os/types.h>
 #include <mini-os/os.h>
 #include <mini-os/lib.h>
tools/libs/light/libxl_qmp.c +1 -1
index 8faa102e4d..6b0cd607d8 100644
@@ -63,7 +63,7 @@
 
 #include <yajl/yajl_gen.h>
 
-#include "_xen_list.h"
+#include "xen_list.h"
 #include "libxl_internal.h"
 
 /* #define DEBUG_RECEIVED */
Signature · 1 line
2.36.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Roger Pau Monne

A leading underscore is used to indicate auto generated headers, and the clean use of 'rm -f _*.h' will remove those. _xen_list.h also uses a leading underscore, but is checked in the repo and as such cannot be removed as part of the clean rule.

Fix this by dropping the leading underscore, so that the header is not removed.

Fixes a03b3552d4 ('libs,tools/include: Clean "clean" targets')

Juergen