| Message ID | 20230322120844.19657-3-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tools: use xen-tools/libs.h for common definitions | expand |
On 22.03.2023 13:08, Juergen Gross wrote: > --- a/tools/tests/vpci/emul.h > +++ b/tools/tests/vpci/emul.h > @@ -106,22 +106,6 @@ typedef union { > #define BUG() assert(0) > #define ASSERT_UNREACHABLE() assert(0) > > -#define min(x, y) ({ \ > - const typeof(x) tx = (x); \ > - const typeof(y) ty = (y); \ > - \ > - (void) (&tx == &ty); \ > - tx < ty ? tx : ty; \ > -}) > - > -#define max(x, y) ({ \ > - const typeof(x) tx = (x); \ > - const typeof(y) ty = (y); \ > - \ > - (void) (&tx == &ty); \ > - tx > ty ? tx : ty; \ > -}) The new include is added to this file by the first patch. How do things build warning-free before these macros (functionally compatible but different in the specific tokens used) are removed, i.e. before this patch is (also) applied? Jan
On 22.03.23 13:38, Jan Beulich wrote: > On 22.03.2023 13:08, Juergen Gross wrote: >> --- a/tools/tests/vpci/emul.h >> +++ b/tools/tests/vpci/emul.h >> @@ -106,22 +106,6 @@ typedef union { >> #define BUG() assert(0) >> #define ASSERT_UNREACHABLE() assert(0) >> >> -#define min(x, y) ({ \ >> - const typeof(x) tx = (x); \ >> - const typeof(y) ty = (y); \ >> - \ >> - (void) (&tx == &ty); \ >> - tx < ty ? tx : ty; \ >> -}) >> - >> -#define max(x, y) ({ \ >> - const typeof(x) tx = (x); \ >> - const typeof(y) ty = (y); \ >> - \ >> - (void) (&tx == &ty); \ >> - tx > ty ? tx : ty; \ >> -}) > > The new include is added to this file by the first patch. How do things > build warning-free before these macros (functionally compatible but > different in the specific tokens used) are removed, i.e. before this > patch is (also) applied? Oh, I seem to have failed to make a test build of the tools/tests directory after applying only the first patch. It would be probably be the best to switch patches 1 and 2 while keeping the "#include <xen-tools/common-macros.h>" in tools/tests/vpci/emul.h in the first patch. Juergen
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 8d95eab28a..e04990ee97 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -9,6 +9,8 @@ #include <xen/hvm/hvm_info_table.h> #include "e820.h" +#include <xen-tools/common-macros.h> + /* Request un-prefixed values from errno.h. */ #define XEN_ERRNO(name, value) name = value, enum { @@ -41,12 +43,6 @@ void __assert_failed(const char *assertion, const char *file, int line) void __bug(const char *file, int line) __attribute__((noreturn)); #define BUG() __bug(__FILE__, __LINE__) #define BUG_ON(p) do { if (p) BUG(); } while (0) -#define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) - -#define min_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#define max_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) #define MB(mb) (mb##ULL << 20) #define GB(gb) (gb##ULL << 30) diff --git a/tools/libs/vchan/init.c b/tools/libs/vchan/init.c index 9195bd3b98..021e1f29e1 100644 --- a/tools/libs/vchan/init.c +++ b/tools/libs/vchan/init.c @@ -45,6 +45,7 @@ #include <xen/sys/gntalloc.h> #include <xen/sys/gntdev.h> #include <libxenvchan.h> +#include <xen-tools/common-macros.h> #include "vchan.h" @@ -72,8 +73,6 @@ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif -#define max(a,b) ((a > b) ? a : b) - static int init_gnt_srv(struct libxenvchan *ctrl, int domain) { int pages_left = ctrl->read.order >= PAGE_SHIFT ? 1 << (ctrl->read.order - PAGE_SHIFT) : 0; diff --git a/tools/tests/vpci/Makefile b/tools/tests/vpci/Makefile index 5075bc2be2..62f21f341a 100644 --- a/tools/tests/vpci/Makefile +++ b/tools/tests/vpci/Makefile @@ -11,7 +11,7 @@ run: $(TARGET) ./$(TARGET) $(TARGET): vpci.c vpci.h list.h main.c emul.h - $(HOSTCC) -g -o $@ vpci.c main.c + $(HOSTCC) $(CFLAGS_xeninclude) -g -o $@ vpci.c main.c .PHONY: clean clean: diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index 7169a2ea02..8c5bcadd5f 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -106,22 +106,6 @@ typedef union { #define BUG() assert(0) #define ASSERT_UNREACHABLE() assert(0) -#define min(x, y) ({ \ - const typeof(x) tx = (x); \ - const typeof(y) ty = (y); \ - \ - (void) (&tx == &ty); \ - tx < ty ? tx : ty; \ -}) - -#define max(x, y) ({ \ - const typeof(x) tx = (x); \ - const typeof(y) ty = (y); \ - \ - (void) (&tx == &ty); \ - tx > ty ? tx : ty; \ -}) - #endif /*
Defining min(), min_t(), max() and max_t() at other places than xen-tools/common-macros.h isn't needed, as the definitions in said header can be used instead. Same applies to BUILD_BUG_ON() in hvmloader. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/firmware/hvmloader/util.h | 8 ++------ tools/libs/vchan/init.c | 3 +-- tools/tests/vpci/Makefile | 2 +- tools/tests/vpci/emul.h | 16 ---------------- 4 files changed, 4 insertions(+), 25 deletions(-)