[Xen-changelog] Remove __TEST_HARNESS__ tests from x86_emulate: instead check for __XEN__

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 25dbb18196335574e4f582fd5ddb941f41169110
# Parent  cb4d2fc638eca7a4270da168fcf63f2fd12afd67
Remove __TEST_HARNESS__ tests from x86_emulate: instead check for __XEN__
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/tests/Makefile       |    2 --
 xen/arch/x86/x86_emulate.c |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff -r cb4d2fc638ec -r 25dbb1819633 tools/tests/Makefile
--- a/tools/tests/Makefile      Thu May 18 10:40:55 2006 +0100
+++ b/tools/tests/Makefile      Thu May 18 10:43:05 2006 +0100
@@ -3,8 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator
-
-HOSTCFLAGS += -D__TEST_HARNESS__
 
 .PHONY: all
 all: $(TARGET)
diff -r cb4d2fc638ec -r 25dbb1819633 xen/arch/x86/x86_emulate.c
--- a/xen/arch/x86/x86_emulate.c        Thu May 18 10:40:55 2006 +0100
+++ b/xen/arch/x86/x86_emulate.c        Thu May 18 10:43:05 2006 +0100
@@ -6,7 +6,7 @@
  * Copyright (c) 2005 Keir Fraser
  */
 
-#ifdef __TEST_HARNESS__
+#ifndef __XEN__
 #include <stdio.h>
 #include <stdint.h>
 #include <public/xen.h>
@@ -1127,7 +1127,7 @@ x86_emulate_memop(
     return -1;
 }
 
-#ifndef __TEST_HARNESS__
+#ifdef __XEN__
 
 #include <asm/mm.h>
 #include <asm/uaccess.h>

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