x86/PVHv2: add XEN_ prefix to HVM_START_MAGIC_VALUE

Reported by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
index ac4dae5eb1d81a7763bb151528573c77efacd6f4..e13a4aa01fd08e3b9b8b76eb3424e4a6d8ebc2dd 100644 (file)
--- a/tools/libxc/xc_dom_x86.c
+++ b/tools/libxc/xc_dom_x86.c
@@ -1753,7 +1753,7 @@ static int bootlate_hvm(struct xc_dom_image *dom)
             start_info->nr_modules = 1;
         }
 
-        start_info->magic = HVM_START_MAGIC_VALUE;
+        start_info->magic = XEN_HVM_START_MAGIC_VALUE;
 
         munmap(start_page, start_info_size);
     }

diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index ad00bf9ce1573a15337a607e24db756934d699bd..64ba7ab91e21848add33a1275fc08f3f537ad30b 100644 (file)
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -804,7 +804,7 @@ typedef struct start_info start_info_t;
  * of the address fields should be treated as not present.
  *
  *  0 +----------------+
- *    | magic          | Contains the magic value HVM_START_MAGIC_VALUE
+ *    | magic          | Contains the magic value XEN_HVM_START_MAGIC_VALUE
  *    |                | ("xEn3" with the 0x80 bit of the "E" set).
  *  4 +----------------+
  *    | version        | Version of this structure. Current version is 0. New
@@ -839,7 +839,7 @@ typedef struct start_info start_info_t;
  * The address and size of the modules is a 64bit unsigned integer. However
  * Xen will always try to place all modules below the 4GiB boundary.
  */
-#define HVM_START_MAGIC_VALUE 0x336ec578
+#define XEN_HVM_START_MAGIC_VALUE 0x336ec578
 
 /* New console union for dom0 introduced in 0x00030203. */
 #if __XEN_INTERFACE_VERSION__ < 0x00030203