1.1 --- a/tools/tests/Makefile	Thu May 18 10:40:55 2006 +0100
     1.2 +++ b/tools/tests/Makefile	Thu May 18 10:43:05 2006 +0100
     1.3 @@ -4,8 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
     1.4  
     1.5  TARGET := test_x86_emulator
     1.6  
     1.7 -HOSTCFLAGS += -D__TEST_HARNESS__
     1.8 -
     1.9  .PHONY: all
    1.10  all: $(TARGET)
    1.11  

     2.1 --- a/xen/arch/x86/x86_emulate.c	Thu May 18 10:40:55 2006 +0100
     2.2 +++ b/xen/arch/x86/x86_emulate.c	Thu May 18 10:43:05 2006 +0100
     2.3 @@ -6,7 +6,7 @@
     2.4   * Copyright (c) 2005 Keir Fraser
     2.5   */
     2.6  
     2.7 -#ifdef __TEST_HARNESS__
     2.8 +#ifndef __XEN__
     2.9  #include <stdio.h>
    2.10  #include <stdint.h>
    2.11  #include <public/xen.h>
    2.12 @@ -1127,7 +1127,7 @@ x86_emulate_memop(
    2.13      return -1;
    2.14  }
    2.15  
    2.16 -#ifndef __TEST_HARNESS__
    2.17 +#ifdef __XEN__
    2.18  
    2.19  #include <asm/mm.h>
    2.20  #include <asm/uaccess.h>