From 9d067857d1ff6805608aac4d9c0ea1c848b2e637 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Mon, 20 Jun 2022 14:35:00 +0200
Subject: [PATCH] tools/include: drop leading underscore from xen_list header
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
---
 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%)

diff --git a/tools/include/Makefile b/tools/include/Makefile
index 3a03a0b0fa..b488f7ca9f 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -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:
diff --git a/tools/include/libxl.h b/tools/include/libxl.h
index 51a9b6cfac..7ce978e83c 100644
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
@@ -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
diff --git a/tools/include/_xen_list.h b/tools/include/xen_list.h
similarity index 100%
rename from tools/include/_xen_list.h
rename to tools/include/xen_list.h
diff --git a/tools/include/xentoolcore_internal.h b/tools/include/xentoolcore_internal.h
index deccefd612..1be014434d 100644
--- a/tools/include/xentoolcore_internal.h
+++ b/tools/include/xentoolcore_internal.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 
 #include "xentoolcore.h"
-#include "_xen_list.h"
+#include "xen_list.h"
 
 /*---------- active handle registration ----------*/
 
diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c
index 8ff46de884..28743cb055 100644
--- a/tools/libs/evtchn/minios.c
+++ b/tools/libs/evtchn/minios.c
@@ -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>
diff --git a/tools/libs/light/libxl_qmp.c b/tools/libs/light/libxl_qmp.c
index 8faa102e4d..6b0cd607d8 100644
--- a/tools/libs/light/libxl_qmp.c
+++ b/tools/libs/light/libxl_qmp.c
@@ -63,7 +63,7 @@
 
 #include <yajl/yajl_gen.h>
 
-#include "_xen_list.h"
+#include "xen_list.h"
 #include "libxl_internal.h"
 
 /* #define DEBUG_RECEIVED */
-- 
2.30.2