xnu-792.21.3.tar.gz

[apple/xnu.git] / osfmk / kern / ipc_host.c

diff --git a/osfmk/kern/ipc_host.c b/osfmk/kern/ipc_host.c
index 23d830ffd5c5ed25455a0310e17aedeb3d1c9a22..0e8196cc008a7d327df8dacb9fd1c8fa8cb56bdd 100644 (file)
--- a/osfmk/kern/ipc_host.c
+++ b/osfmk/kern/ipc_host.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -60,8 +63,8 @@
  */
 #include <mach/message.h>
 #include <mach/mach_traps.h>
  */
 #include <mach/message.h>
 #include <mach/mach_traps.h>

-#include <mach/etap_events.h>

 #include <mach/mach_host_server.h>
 #include <mach/mach_host_server.h>

+#include <mach/host_priv_server.h>

 #include <kern/host.h>
 #include <kern/processor.h>
 #include <kern/lock.h>
 #include <kern/host.h>
 #include <kern/processor.h>
 #include <kern/lock.h>


@@ -99,7 +102,7 @@ void ipc_host_init(void)
        ipc_port_t      port;
        int i;
 
        ipc_port_t      port;
        int i;
 

-       mutex_init(&realhost.lock, ETAP_MISC_MASTER);
+       mutex_init(&realhost.lock, 0);

 
        /*
         *      Allocate and set up the two host ports.
 
        /*
         *      Allocate and set up the two host ports.


@@ -108,24 +111,27 @@ void ipc_host_init(void)
        if (port == IP_NULL)
                panic("ipc_host_init");
 
        if (port == IP_NULL)
                panic("ipc_host_init");
 

-       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST);
-       realhost.host_self = port;
+       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST_SECURITY);
+       kernel_set_special_port(&realhost, HOST_SECURITY_PORT,
+                               ipc_port_make_send(port));

 
        port = ipc_port_alloc_kernel();
        if (port == IP_NULL)
                panic("ipc_host_init");
 
 
        port = ipc_port_alloc_kernel();
        if (port == IP_NULL)
                panic("ipc_host_init");
 

-       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST_PRIV);
-       realhost.host_priv_self = port;
+       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST);
+       kernel_set_special_port(&realhost, HOST_PORT,
+                               ipc_port_make_send(port));

 
        port = ipc_port_alloc_kernel();
        if (port == IP_NULL)
                panic("ipc_host_init");
 
 
        port = ipc_port_alloc_kernel();
        if (port == IP_NULL)
                panic("ipc_host_init");
 

-       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST_SECURITY);
-       realhost.host_security_self = port;
+       ipc_kobject_set(port, (ipc_kobject_t) &realhost, IKOT_HOST_PRIV);
+       kernel_set_special_port(&realhost, HOST_PRIV_PORT,
+                               ipc_port_make_send(port));

 
 

-       realhost.io_master = IP_NULL;
+       /* the rest of the special ports will be set up later */

 
        for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) {
                        realhost.exc_actions[i].port = IP_NULL;
 
        for (i = FIRST_EXCEPTION; i < EXC_TYPES_COUNT; i++) {
                        realhost.exc_actions[i].port = IP_NULL;


@@ -156,12 +162,15 @@ void ipc_host_init(void)
  */
 
 mach_port_name_t
  */
 
 mach_port_name_t

-host_self_trap(void)
+host_self_trap(
+       __unused struct host_self_trap_args *args)

 {
        ipc_port_t sright;
 {
        ipc_port_t sright;

+       mach_port_name_t name;

 
        sright = ipc_port_copy_send(current_task()->itk_host);
 
        sright = ipc_port_copy_send(current_task()->itk_host);

-       return ipc_port_copyout_send(sright, current_space());
+       name = ipc_port_copyout_send(sright, current_space());
+       return name;

 }
 
 /*
 }
 
 /*


@@ -504,8 +513,7 @@ convert_host_to_port(
 {
        ipc_port_t port;
 
 {
        ipc_port_t port;
 

-       port = ipc_port_make_send(host->host_self);
-
+       host_get_host_port(host, &port);

        return port;
 }
 
        return port;
 }
 


@@ -724,9 +732,7 @@ host_get_exception_ports(
        exception_behavior_array_t      behaviors,
        thread_state_flavor_array_t     flavors         )
 {
        exception_behavior_array_t      behaviors,
        thread_state_flavor_array_t     flavors         )
 {

-       register int    i,
-                       j,
-                       count;
+       unsigned int    i, j, count;

 
        if (host_priv == HOST_PRIV_NULL)
                return KERN_INVALID_ARGUMENT;
 
        if (host_priv == HOST_PRIV_NULL)
                return KERN_INVALID_ARGUMENT;


@@ -788,7 +794,7 @@ host_swap_exception_ports(
        exception_behavior_array_t      behaviors,
        thread_state_flavor_array_t     flavors         )
 {
        exception_behavior_array_t      behaviors,
        thread_state_flavor_array_t     flavors         )
 {

-       register int    i,
+       unsigned int    i,

                        j,
                        count;
        ipc_port_t      old_port[EXC_TYPES_COUNT];
                        j,
                        count;
        ipc_port_t      old_port[EXC_TYPES_COUNT];