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@suse.com>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>

diff --git a/tools/libs/light/libxl_disk.c b/tools/libs/light/libxl_disk.c
index 15055380c65f9b63a324646496655d3f464c8ff2..6a0b6e06fee607eba9104df951ca7eeec378d8f1 100644 (file)
--- 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 cfac8e18b6d361f5b5fd85ce65f21051bb6885e4..408a771310c5670a82919dcb180271a3f17cf9d5 100644 (file)
--- 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 9213dd957c54b3a5923f256895510a71de7bec82..0c180fff52785d7dd1bef8e78eaf54b598e2db57 100644 (file)
--- 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 f37dd443bdd99662f501e1597e8ba76f7ab93891..14c9fa1112551c1981ce0138be505b24e1a54dde 100644 (file)
--- 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 1f7559ecd976fea3acf1f209c2090a4060590432..a82385fbb5b1228f4483bc3b18e269487edaf704 100644 (file)
--- 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*/
 
 /*