Re: [PATCH 11/11] proc: store the device master port in _hurd_device_master

[Samuel Thibault]

Justus Winter, le Wed 27 Nov 2013 13:31:18 +0100, a écrit :
> * proc/host.c (S_proc_getprivports): Adapt accordingly.
> * proc/main.c (main): Store the device master port in _hurd_device_master.
> * proc/proc.h (master_device_port): Remove unused variable.

Ditto, ack.

> ---
>  proc/host.c |    2 +-
>  proc/main.c |    4 ++--
>  proc/proc.h |    2 --
>  3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/proc/host.c b/proc/host.c
> index b5c93b4..6841273 100644
> --- a/proc/host.c
> +++ b/proc/host.c
> @@ -71,7 +71,7 @@ S_proc_getprivports (struct proc *p,
>      return EPERM;
>  
>    *hostpriv = _hurd_host_priv;
> -  *devpriv = master_device_port;
> +  *devpriv = _hurd_device_master;
>    return 0;
>  }
>  
> diff --git a/proc/main.c b/proc/main.c
> index 7be89ce..aaaa5a7 100644
> --- a/proc/main.c
> +++ b/proc/main.c
> @@ -92,7 +92,7 @@ main (int argc, char **argv, char **envp)
>  
>    startup_port = ports_get_send_right (startup_proc);
>    err = startup_procinit (boot, startup_port, &startup_proc->p_task,
> -                       &authserver, &_hurd_host_priv, &master_device_port);
> +                       &authserver, &_hurd_host_priv, &_hurd_device_master);
>    assert_perror (err);
>    mach_port_deallocate (mach_task_self (), startup_port);
>  
> @@ -126,7 +126,7 @@ main (int argc, char **argv, char **envp)
>         to panic or something.  */
>      mach_port_t cons;
>      error_t err;
> -    err = device_open (master_device_port, D_READ|D_WRITE, "console", &cons);
> +    err = device_open (_hurd_device_master, D_READ|D_WRITE, "console", 
> &cons);
>      assert_perror (err);
>      stdin = mach_open_devstream (cons, "r");
>      stdout = stderr = mach_open_devstream (cons, "w");
> diff --git a/proc/proc.h b/proc/proc.h
> index 783aba9..12f56da 100644
> --- a/proc/proc.h
> +++ b/proc/proc.h
> @@ -141,8 +141,6 @@ struct port_class *proc_class;
>  struct port_class *generic_port_class;
>  struct port_class *exc_class;
>  
> -mach_port_t master_device_port;
> -
>  mach_port_t generic_port;    /* messages not related to a specific proc */
>  
>  pthread_mutex_t global_lock;
> -- 
> 1.7.10.4
> 

-- 
Samuel
> [Linux] c'est une philosophie un art de vivre, un état intérieur,
> une sorte de fluide qui nous entoure et nous pénètre.
Fais tourner stp !
-+- Guillaume in Guide du linuxien pervers - "Tous drogués j'vous dis !"