1.1 --- a/Config.mk	Thu Jul 12 16:07:28 2007 +0100
     1.2 +++ b/Config.mk	Fri Jul 13 13:42:41 2007 +0100
     1.3 @@ -81,14 +81,6 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES)
     1.4  #        n - Do not build the Xen ACM framework
     1.5  ACM_SECURITY ?= n
     1.6  
     1.7 -# If ACM_SECURITY = y and no boot policy file is installed,
     1.8 -# then the ACM defaults to the security policy set by
     1.9 -# ACM_DEFAULT_SECURITY_POLICY
    1.10 -# Supported models are:
    1.11 -#	ACM_NULL_POLICY
    1.12 -#	ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
    1.13 -ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
    1.14 -
    1.15  # Optional components
    1.16  XENSTAT_XENTOP     ?= y
    1.17  VTPM_TOOLS         ?= n

     2.1 --- a/xen/Makefile	Thu Jul 12 16:07:28 2007 +0100
     2.2 +++ b/xen/Makefile	Fri Jul 13 13:42:41 2007 +0100
     2.3 @@ -59,7 +59,6 @@ build install debug clean distclean csco
     2.4  	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean
     2.5  	rm -f include/asm *.o $(TARGET)* *~ core
     2.6  	rm -f include/asm-*/asm-offsets.h
     2.7 -	rm -f include/xen/acm_policy.h
     2.8  
     2.9  .PHONY: _distclean
    2.10  _distclean: clean
    2.11 @@ -72,7 +71,6 @@ build install debug clean distclean csco
    2.12  $(TARGET): delete-unfresh-files build-headers
    2.13  	$(MAKE) -C tools
    2.14  	$(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h
    2.15 -	$(MAKE) -f $(BASEDIR)/Rules.mk include/xen/acm_policy.h
    2.16  	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
    2.17  	$(MAKE) -f $(BASEDIR)/Rules.mk -C include
    2.18  	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) asm-offsets.s
    2.19 @@ -87,20 +85,6 @@ delete-unfresh-files:
    2.20  		rm -f include/xen/compile.h; \
    2.21  	fi
    2.22  
    2.23 -# acm_policy.h contains security policy for Xen
    2.24 -include/xen/acm_policy.h:
    2.25 -	@(set -e; \
    2.26 -	  echo "/*"; \
    2.27 -	  echo " * DO NOT MODIFY."; \
    2.28 -	  echo " *"; \
    2.29 -	  echo " * This file was auto-generated by xen/Makefile $<"; \
    2.30 -	  echo " *"; \
    2.31 -	  echo " */"; \
    2.32 -	  echo ""; \
    2.33 -	  echo "#ifndef ACM_DEFAULT_SECURITY_POLICY"; \
    2.34 -	  echo "#define ACM_DEFAULT_SECURITY_POLICY $(ACM_DEFAULT_SECURITY_POLICY)"; \
    2.35 -	  echo "#endif") >$@
    2.36 -
    2.37  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    2.38  include/xen/compile.h: include/xen/compile.h.in
    2.39  	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \

     3.1 --- a/xen/include/acm/acm_core.h	Thu Jul 12 16:07:28 2007 +0100
     3.2 +++ b/xen/include/acm/acm_core.h	Fri Jul 13 13:42:41 2007 +0100
     3.3 @@ -22,10 +22,12 @@
     3.4  #include <xen/spinlock.h>
     3.5  #include <xen/list.h>
     3.6  #include <public/acm.h>
     3.7 -#include <xen/acm_policy.h>
     3.8  #include <public/acm_ops.h>
     3.9  #include <acm/acm_endian.h>
    3.10  
    3.11 +#define ACM_DEFAULT_SECURITY_POLICY \
    3.12 +        ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
    3.13 +
    3.14  /* Xen-internal representation of the binary policy */
    3.15  struct acm_binary_policy {
    3.16      char *policy_reference_name;