[Xen-changelog] [xen master] x86/PVHv2: add XEN_ prefix to HVM_START_MAGIC_VALUE

[patchbot@xxxxxxx]

commit c5360bdfe0cecaf3e8cfc6eea3c5096a7856fcac
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Mon Feb 22 17:20:37 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Feb 22 17:20:37 2016 +0100

    x86/PVHv2: add XEN_ prefix to HVM_START_MAGIC_VALUE
    
    Reported by: Jan Beulich <jbeulich@xxxxxxxx>
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/libxc/xc_dom_x86.c | 2 +-
 xen/include/public/xen.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
index ac4dae5..e13a4aa 100644
--- 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 ad00bf9..64ba7ab 100644
--- 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog