[Xen-changelog] [xen-unstable] [XSM][FLASK] Remove unused code from XSM and Flask

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216629750 -3600
# Node ID 217c8b6ebfab10a9fe68d3406f7179fc27aec8e7
# Parent  fa66b33f975a8f7940249e0eb4a45c87a978ba50
[XSM][FLASK] Remove unused code from XSM and Flask

The complete_init hook has been unused since the introduction of the
create secure interface for domain_create.

Signed-off-by: George Coker <gscoker@xxxxxxxxxxxxxx>
---
 xen/include/xsm/xsm.h |    6 ------
 xen/xsm/dummy.c       |    6 ------
 xen/xsm/flask/hooks.c |   13 -------------
 3 files changed, 25 deletions(-)

diff -r fa66b33f975a -r 217c8b6ebfab xen/include/xsm/xsm.h
--- a/xen/include/xsm/xsm.h     Mon Jul 21 09:41:36 2008 +0100
+++ b/xen/include/xsm/xsm.h     Mon Jul 21 09:42:30 2008 +0100
@@ -108,7 +108,6 @@ struct xsm_operations {
     int (*schedop_shutdown) (struct domain *d1, struct domain *d2);
 
     long (*__do_xsm_op) (XEN_GUEST_HANDLE(xsm_op_t) op);
-    void (*complete_init) (struct domain *d);
 
 #ifdef CONFIG_X86
     int (*shadow_control) (struct domain *d, uint32_t op);
@@ -392,11 +391,6 @@ static inline long __do_xsm_op (XEN_GUES
     return xsm_call(__do_xsm_op(op));
 }
 
-static inline void xsm_complete_init (struct domain *d)
-{
-    xsm_call(complete_init(d));
-}
-
 #ifdef XSM_ENABLE
 extern int xsm_init(unsigned int *initrdidx, const multiboot_info_t *mbi,
                                           unsigned long initial_images_start);
diff -r fa66b33f975a -r 217c8b6ebfab xen/xsm/dummy.c
--- a/xen/xsm/dummy.c   Mon Jul 21 09:41:36 2008 +0100
+++ b/xen/xsm/dummy.c   Mon Jul 21 09:42:30 2008 +0100
@@ -250,11 +250,6 @@ static int dummy_alloc_security_evtchn (
 }
 
 static void dummy_free_security_evtchn (struct evtchn *chn)
-{
-    return;
-}
-
-static void dummy_complete_init (struct domain *d)
 {
     return;
 }
@@ -462,7 +457,6 @@ void xsm_fixup_ops (struct xsm_operation
     set_to_dummy_if_null(ops, schedop_shutdown);
 
     set_to_dummy_if_null(ops, __do_xsm_op);
-    set_to_dummy_if_null(ops, complete_init);
 
 #ifdef CONFIG_X86
     set_to_dummy_if_null(ops, shadow_control);
diff -r fa66b33f975a -r 217c8b6ebfab xen/xsm/flask/hooks.c
--- a/xen/xsm/flask/hooks.c     Mon Jul 21 09:41:36 2008 +0100
+++ b/xen/xsm/flask/hooks.c     Mon Jul 21 09:42:30 2008 +0100
@@ -712,18 +712,6 @@ static int flask_perfcontrol(void)
 static int flask_perfcontrol(void)
 {
     return domain_has_xen(current->domain, XEN__PERFCONTROL);
-}
-
-void flask_complete_init(struct domain *d)
-{
-    struct domain_security_struct *dsec;
-
-    /* Set the security state for the Dom0 domain. */
-    dsec = d->ssid;
-    dsec->sid = SECINITSID_DOM0;
-    dsec->create_sid = SECINITSID_UNLABELED;
-
-    printk("Flask:  Completed initialization.\n");
 }
 
 #ifdef CONFIG_X86
@@ -1101,7 +1089,6 @@ static struct xsm_operations flask_ops =
     .schedop_shutdown = flask_schedop_shutdown,
 
     .__do_xsm_op = do_flask_op,
-    .complete_init = flask_complete_init,    
 
 #ifdef CONFIG_X86
     .shadow_control = flask_shadow_control,

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