[xen staging] libxl{,u}: replace TOSTRING()

[patchbot@xxxxxxx]

commit 36ce9faad9e7f18e380092070484a0d7004974e8
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Apr 8 09:39:50 2025 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 8 09:39:50 2025 +0200

    libxl{,u}: replace TOSTRING()
    
    Now that common-macros.h has STR() available, which is even slightly
    more flexible, use that and drop the custom macros.
    
    No difference in generated code (except for line numbers, of course,
    where embedded in code/data).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
 tools/libs/light/libxl_disk.c     | 2 +-
 tools/libs/light/libxl_internal.h | 3 ---
 tools/libs/util/libxlu_disk_l.c   | 2 +-
 tools/libs/util/libxlu_disk_l.l   | 2 +-
 tools/libs/util/libxlu_internal.h | 6 ++----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/libs/light/libxl_disk.c b/tools/libs/light/libxl_disk.c
index 15055380c6..6a0b6e06fe 100644
--- a/tools/libs/light/libxl_disk.c
+++ b/tools/libs/light/libxl_disk.c
@@ -53,7 +53,7 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, 
libxl__ev_xswatch *w,
     }
 
     sscanf(backend,
-            "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE)
+           "/local/domain/%d/backend/%" STR(BACKEND_STRING_SIZE)
            "[a-z]/%*d/%*d",
            &disk->backend_domid, backend_type);
     if (!strcmp(backend_type, "tap") ||
diff --git a/tools/libs/light/libxl_internal.h 
b/tools/libs/light/libxl_internal.h
index cfac8e18b6..408a771310 100644
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
@@ -2093,9 +2093,6 @@ _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, 
pthread_mutex_t *lock);
 
 _hidden int libxl__gettimeofday(libxl__gc *gc, struct timeval *now_r);
 
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-
 /* from libxl_qmp */
 typedef struct libxl__qmp_handler libxl__qmp_handler;
 
diff --git a/tools/libs/util/libxlu_disk_l.c b/tools/libs/util/libxlu_disk_l.c
index 9213dd957c..0c180fff52 100644
--- a/tools/libs/util/libxlu_disk_l.c
+++ b/tools/libs/util/libxlu_disk_l.c
@@ -1152,7 +1152,7 @@ void xlu__disk_yyset_column(int  column_no, yyscan_t 
yyscanner);
 #define DSET(dpc,member,enumname,str,valname) do{                      \
        if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN &&     \
            dpc->disk->member != LIBXL_DISK_##enumname##_##valname) {   \
-           xlu__disk_err(dpc, str, TOSTRING(member) " respecified");   \
+           xlu__disk_err(dpc, str, STR(member) " respecified");        \
        } else {                                                        \
            dpc->disk->member = LIBXL_DISK_##enumname##_##valname;      \
        }                                                               \
diff --git a/tools/libs/util/libxlu_disk_l.l b/tools/libs/util/libxlu_disk_l.l
index f37dd443bd..14c9fa1112 100644
--- a/tools/libs/util/libxlu_disk_l.l
+++ b/tools/libs/util/libxlu_disk_l.l
@@ -64,7 +64,7 @@ void xlu__disk_yyset_column(int  column_no, yyscan_t 
yyscanner);
 #define DSET(dpc,member,enumname,str,valname) do{                      \
        if (dpc->disk->member != LIBXL_DISK_##enumname##_UNKNOWN &&     \
            dpc->disk->member != LIBXL_DISK_##enumname##_##valname) {   \
-           xlu__disk_err(dpc, str, TOSTRING(member) " respecified");   \
+           xlu__disk_err(dpc, str, STR(member) " respecified");        \
        } else {                                                        \
            dpc->disk->member = LIBXL_DISK_##enumname##_##valname;      \
        }                                                               \
diff --git a/tools/libs/util/libxlu_internal.h 
b/tools/libs/util/libxlu_internal.h
index 1f7559ecd9..a82385fbb5 100644
--- a/tools/libs/util/libxlu_internal.h
+++ b/tools/libs/util/libxlu_internal.h
@@ -25,6 +25,8 @@
 
 #include "libxlutil.h"
 
+#include <xen-tools/common-macros.h>
+
 struct XLU_ConfigList {
     int avalues; /* available slots */
     int nvalues; /* actual occupied slots */
@@ -69,10 +71,6 @@ typedef struct {
     void *scanner;
 } CfgParseContext;
 
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-
 #endif /*LIBXLU_INTERNAL_H*/
 
 /*
--
generated by git-patchbot for /home/xen/git/xen.git#staging