debuggers.hg

changeset 22708:2e1bd6baee28

ocaml: rename Evtchn.bind_virq as Evtchn.bind_dom_exc_virq

Rename Evtchn.bind_virq as Evtchn.bind_dom_exc_virq
to reflect its actual behaviour.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Ian Campbell <ian.campbell@citrix.com>
date Thu Jan 06 17:34:46 2011 +0000 (2011-01-06)
parents 9b0b2233f2e6
children 4e120cb427f4
files tools/ocaml/libs/eventchn/eventchn.ml tools/ocaml/libs/eventchn/eventchn.mli tools/ocaml/libs/eventchn/eventchn_stubs.c tools/ocaml/xenstored/event.ml tools/ocaml/xenstored/xenstored.ml
line diff
     1.1 --- a/tools/ocaml/libs/eventchn/eventchn.ml	Thu Jan 06 17:33:39 2011 +0000
     1.2 +++ b/tools/ocaml/libs/eventchn/eventchn.ml	Thu Jan 06 17:34:46 2011 +0000
     1.3 @@ -19,7 +19,7 @@ exception Error of string
     1.4  external init: unit -> Unix.file_descr = "stub_eventchn_init"
     1.5  external notify: Unix.file_descr -> int -> unit = "stub_eventchn_notify"
     1.6  external bind_interdomain: Unix.file_descr -> int -> int -> int = "stub_eventchn_bind_interdomain"
     1.7 -external bind_virq: Unix.file_descr -> int = "stub_eventchn_bind_virq"
     1.8 +external bind_dom_exc_virq: Unix.file_descr -> int = "stub_eventchn_bind_dom_exc_virq"
     1.9  external unbind: Unix.file_descr -> int -> unit = "stub_eventchn_unbind"
    1.10  external read_port: Unix.file_descr -> int = "stub_eventchn_read_port"
    1.11  external write_port: Unix.file_descr -> int -> unit = "stub_eventchn_write_port"
     2.1 --- a/tools/ocaml/libs/eventchn/eventchn.mli	Thu Jan 06 17:33:39 2011 +0000
     2.2 +++ b/tools/ocaml/libs/eventchn/eventchn.mli	Thu Jan 06 17:34:46 2011 +0000
     2.3 @@ -19,7 +19,7 @@ external init : unit -> Unix.file_descr 
     2.4  external notify : Unix.file_descr -> int -> unit = "stub_eventchn_notify"
     2.5  external bind_interdomain : Unix.file_descr -> int -> int -> int
     2.6    = "stub_eventchn_bind_interdomain"
     2.7 -external bind_virq : Unix.file_descr -> int = "stub_eventchn_bind_virq"
     2.8 +external bind_dom_exc_virq : Unix.file_descr -> int = "stub_eventchn_bind_dom_exc_virq"
     2.9  external unbind : Unix.file_descr -> int -> unit = "stub_eventchn_unbind"
    2.10  external read_port : Unix.file_descr -> int = "stub_eventchn_read_port"
    2.11  external write_port : Unix.file_descr -> int -> unit
     3.1 --- a/tools/ocaml/libs/eventchn/eventchn_stubs.c	Thu Jan 06 17:33:39 2011 +0000
     3.2 +++ b/tools/ocaml/libs/eventchn/eventchn_stubs.c	Thu Jan 06 17:34:46 2011 +0000
     3.3 @@ -97,7 +97,7 @@ CAMLprim value stub_eventchn_bind_interd
     3.4  	CAMLreturn(port);
     3.5  }
     3.6  
     3.7 -CAMLprim value stub_eventchn_bind_virq(value fd)
     3.8 +CAMLprim value stub_eventchn_bind_dom_exc_virq(value fd)
     3.9  {
    3.10  	CAMLparam1(fd);
    3.11  	CAMLlocal1(port);
     4.1 --- a/tools/ocaml/xenstored/event.ml	Thu Jan 06 17:33:39 2011 +0000
     4.2 +++ b/tools/ocaml/xenstored/event.ml	Thu Jan 06 17:34:46 2011 +0000
     4.3 @@ -21,7 +21,7 @@ type t = {
     4.4  }
     4.5  
     4.6  let init () = { fd = Eventchn.init (); virq_port = -1; }
     4.7 -let bind_virq eventchn = eventchn.virq_port <- Eventchn.bind_virq eventchn.fd
     4.8 +let bind_dom_exc_virq eventchn = eventchn.virq_port <- Eventchn.bind_dom_exc_virq eventchn.fd
     4.9  let bind_interdomain eventchn domid port = Eventchn.bind_interdomain eventchn.fd domid port
    4.10  let unbind eventchn port = Eventchn.unbind eventchn.fd port
    4.11  let notify eventchn port = Eventchn.notify eventchn.fd port
     5.1 --- a/tools/ocaml/xenstored/xenstored.ml	Thu Jan 06 17:33:39 2011 +0000
     5.2 +++ b/tools/ocaml/xenstored/xenstored.ml	Thu Jan 06 17:34:46 2011 +0000
     5.3 @@ -270,7 +270,7 @@ let _ =
     5.4  
     5.5  	if cf.restart then (
     5.6  		DB.from_file store domains cons "/var/run/xenstored/db";
     5.7 -		Event.bind_virq eventchn
     5.8 +		Event.bind_dom_exc_virq eventchn
     5.9  	) else (
    5.10  		if !Disk.enable then (
    5.11  			info "reading store from disk";
    5.12 @@ -284,7 +284,7 @@ let _ =
    5.13  		if cf.domain_init then (
    5.14  			let usingxiu = Xc.using_injection () in
    5.15  			Connections.add_domain cons (Domains.create0 usingxiu domains);
    5.16 -			Event.bind_virq eventchn
    5.17 +			Event.bind_dom_exc_virq eventchn
    5.18  		);
    5.19  	);
    5.20