xen/decompressors: Use new byteorder infrastructure

unaligned.h already includes byteorder.h, so most can simply be dropped.

No functional change.

Signed-off-by: Lin Liu <lin.liu@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_zstd.c b/tools/libs/guest/xg_dom_decompress_unsafe_zstd.c
index ff45732a361661ad42dec527206bd7794f4320bc..319816a390eb15988cd124b4bf0ee898aef9cd79 100644 (file)
--- a/tools/libs/guest/xg_dom_decompress_unsafe_zstd.c
+++ b/tools/libs/guest/xg_dom_decompress_unsafe_zstd.c
@@ -30,9 +30,8 @@ typedef uint64_t __be64;
 
 #undef ERROR
 
-#define __BYTEORDER_HAS_U64__
 #define __TYPES_H__ /* xen/types.h guard */
-#include "../../xen/include/xen/byteorder/little_endian.h"
+#include "../../xen/include/xen/byteorder.h"
 #include "../../xen/include/xen/unaligned.h"
 #include "../../xen/include/xen/xxhash.h"
 #include "../../xen/lib/xxhash64.c"

diff --git a/xen/common/lz4/defs.h b/xen/common/lz4/defs.h
index 46ec46708061da915e00b61ce058bde6e4353f23..9e66ab9579e5a7355279143842cf580844d14df5 100644 (file)
--- a/xen/common/lz4/defs.h
+++ b/xen/common/lz4/defs.h
@@ -12,7 +12,6 @@
 #define COMMON_LZ4_DEFS_H
 
 #ifdef __XEN__
-#include <asm/byteorder.h>
 #include <xen/unaligned.h>
 #else
 

diff --git a/xen/common/lzo.c b/xen/common/lzo.c
index 07b4017812dcbd066044e0692f843888199d37ba..0393ec5c44727ce87f478b0c05903f1bcbe168ca 100644 (file)
--- a/xen/common/lzo.c
+++ b/xen/common/lzo.c
@@ -68,7 +68,6 @@
 
 #ifdef __XEN__
 #include <xen/lib.h>
-#include <asm/byteorder.h>
 #include <xen/unaligned.h>
 #else
 #define get_unaligned_le16(_p) (*(u16 *)(_p))

diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c
index 9022c8f47db67d3e544ee511af998a192660d115..8d64db727862f0a9a61fe369bd30b37e292abf78 100644 (file)
--- a/xen/common/unlzo.c
+++ b/xen/common/unlzo.c
@@ -33,7 +33,6 @@
 #include <xen/lzo.h>
 
 #ifdef __XEN__
-#include <asm/byteorder.h>
 #include <xen/unaligned.h>
 #else
 

diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h
index d70b2ea6dc21e893b69a5cc39da1c11fe2ff8c59..0130104e8031b0a99e5a892ff64553a9bdea47a5 100644 (file)
--- a/xen/common/xz/private.h
+++ b/xen/common/xz/private.h
@@ -12,7 +12,6 @@
 
 #ifdef __XEN__
 #include <xen/kernel.h>
-#include <asm/byteorder.h>
 #include <xen/unaligned.h>
 #else