# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1192093327 -3600
# Node ID ab5b615867ee7913ae6f0afe49f7a5e8ad20ea94
# Parent 51f521303df7c85a7e67a6f543e388530f40b552
Do not include compile.h directly -- use version.h indirection functions.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/hvm/save.c | 8 +++-----
xen/drivers/video/vesa.c | 1 -
xen/drivers/video/vga.c | 1 -
3 files changed, 3 insertions(+), 7 deletions(-)
diff -r 51f521303df7 -r ab5b615867ee xen/arch/x86/hvm/save.c
--- a/xen/arch/x86/hvm/save.c Thu Oct 11 09:41:16 2007 +0100
+++ b/xen/arch/x86/hvm/save.c Thu Oct 11 10:02:07 2007 +0100
@@ -19,16 +19,14 @@
*/
#include <xen/config.h>
-#include <xen/compile.h>
#include <xen/lib.h>
+#include <xen/version.h>
#include <public/version.h>
#include <xen/sched.h>
-
#include <asm/hvm/hvm.h>
#include <asm/hvm/support.h>
#include <asm/hvm/domain.h>
#include <asm/current.h>
-
/* List of handlers for various HVM save and restore types */
static struct {
@@ -94,7 +92,7 @@ int hvm_save(struct domain *d, hvm_domai
hdr.cpuid = eax;
/* Save xen changeset */
- c = strrchr(XEN_CHANGESET, ':');
+ c = strrchr(xen_changeset(), ':');
if ( c )
hdr.changeset = simple_strtoll(c, NULL, 16);
else
@@ -170,7 +168,7 @@ int hvm_load(struct domain *d, hvm_domai
"does not match host (%#"PRIx32").\n", hdr.cpuid, eax);
- c = strrchr(XEN_CHANGESET, ':');
+ c = strrchr(xen_changeset(), ':');
if ( hdr.changeset == -1ULL )
gdprintk(XENLOG_WARNING,
"HVM restore: Xen changeset was not saved.\n");
diff -r 51f521303df7 -r ab5b615867ee xen/drivers/video/vesa.c
--- a/xen/drivers/video/vesa.c Thu Oct 11 09:41:16 2007 +0100
+++ b/xen/drivers/video/vesa.c Thu Oct 11 10:02:07 2007 +0100
@@ -5,7 +5,6 @@
*/
#include <xen/config.h>
-#include <xen/compile.h>
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/mm.h>
diff -r 51f521303df7 -r ab5b615867ee xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c Thu Oct 11 09:41:16 2007 +0100
+++ b/xen/drivers/video/vga.c Thu Oct 11 10:02:07 2007 +0100
@@ -5,7 +5,6 @@
*/
#include <xen/config.h>
-#include <xen/compile.h>
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/mm.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|