WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] [Build] Remove ACM option for NULL and ST

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] [Build] Remove ACM option for NULL and STE+CHWALL policy
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 27 Jul 2007 03:01:41 -0700
Delivery-date: Fri, 27 Jul 2007 02:59:45 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1184330561 -3600
# Node ID 049e4e61644d6dbdae15802dafb7db8e9c5e70fc
# Parent  23a171f65b158eb54095808c935e6dad9e3cb290
[Build] Remove ACM option for NULL and STE+CHWALL policy
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 Config.mk                  |    8 --------
 xen/Makefile               |   16 ----------------
 xen/include/acm/acm_core.h |    4 +++-
 3 files changed, 3 insertions(+), 25 deletions(-)

diff -r 23a171f65b15 -r 049e4e61644d Config.mk
--- a/Config.mk Thu Jul 12 16:07:28 2007 +0100
+++ b/Config.mk Fri Jul 13 13:42:41 2007 +0100
@@ -81,14 +81,6 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES)
 #        n - Do not build the Xen ACM framework
 ACM_SECURITY ?= n
 
-# If ACM_SECURITY = y and no boot policy file is installed,
-# then the ACM defaults to the security policy set by
-# ACM_DEFAULT_SECURITY_POLICY
-# Supported models are:
-#      ACM_NULL_POLICY
-#      ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
-ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
-
 # Optional components
 XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
diff -r 23a171f65b15 -r 049e4e61644d xen/Makefile
--- a/xen/Makefile      Thu Jul 12 16:07:28 2007 +0100
+++ b/xen/Makefile      Fri Jul 13 13:42:41 2007 +0100
@@ -59,7 +59,6 @@ _clean: delete-unfresh-files
        $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean
        rm -f include/asm *.o $(TARGET)* *~ core
        rm -f include/asm-*/asm-offsets.h
-       rm -f include/xen/acm_policy.h
 
 .PHONY: _distclean
 _distclean: clean
@@ -72,7 +71,6 @@ _distclean: clean
 $(TARGET): delete-unfresh-files build-headers
        $(MAKE) -C tools
        $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h
-       $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/acm_policy.h
        [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
        $(MAKE) -f $(BASEDIR)/Rules.mk -C include
        $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) asm-offsets.s
@@ -86,20 +84,6 @@ delete-unfresh-files:
        @if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \
                rm -f include/xen/compile.h; \
        fi
-
-# acm_policy.h contains security policy for Xen
-include/xen/acm_policy.h:
-       @(set -e; \
-         echo "/*"; \
-         echo " * DO NOT MODIFY."; \
-         echo " *"; \
-         echo " * This file was auto-generated by xen/Makefile $<"; \
-         echo " *"; \
-         echo " */"; \
-         echo ""; \
-         echo "#ifndef ACM_DEFAULT_SECURITY_POLICY"; \
-         echo "#define ACM_DEFAULT_SECURITY_POLICY 
$(ACM_DEFAULT_SECURITY_POLICY)"; \
-         echo "#endif") >$@
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
 include/xen/compile.h: include/xen/compile.h.in
diff -r 23a171f65b15 -r 049e4e61644d xen/include/acm/acm_core.h
--- a/xen/include/acm/acm_core.h        Thu Jul 12 16:07:28 2007 +0100
+++ b/xen/include/acm/acm_core.h        Fri Jul 13 13:42:41 2007 +0100
@@ -22,9 +22,11 @@
 #include <xen/spinlock.h>
 #include <xen/list.h>
 #include <public/acm.h>
-#include <xen/acm_policy.h>
 #include <public/acm_ops.h>
 #include <acm/acm_endian.h>
+
+#define ACM_DEFAULT_SECURITY_POLICY \
+        ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
 
 /* Xen-internal representation of the binary policy */
 struct acm_binary_policy {

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] [Build] Remove ACM option for NULL and STE+CHWALL policy, Xen patchbot-unstable <=