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>

diff --git a/tools/ocaml/libs/eventchn/eventchn.ml b/tools/ocaml/libs/eventchn/eventchn.ml
index c4a7fa3dc9a42dbc33fb3a2a6a2a79fa229555ad..674883ccee86999812bdbdf739f2cb750c080a51 100644 (file)
--- a/tools/ocaml/libs/eventchn/eventchn.ml
+++ b/tools/ocaml/libs/eventchn/eventchn.ml
@@ -19,7 +19,7 @@ exception Error of string
 external init: unit -> Unix.file_descr = "stub_eventchn_init"
 external notify: Unix.file_descr -> int -> unit = "stub_eventchn_notify"
 external bind_interdomain: Unix.file_descr -> int -> int -> int = "stub_eventchn_bind_interdomain"
-external bind_virq: Unix.file_descr -> int = "stub_eventchn_bind_virq"
+external bind_dom_exc_virq: Unix.file_descr -> int = "stub_eventchn_bind_dom_exc_virq"
 external unbind: Unix.file_descr -> int -> unit = "stub_eventchn_unbind"
 external read_port: Unix.file_descr -> int = "stub_eventchn_read_port"
 external write_port: Unix.file_descr -> int -> unit = "stub_eventchn_write_port"

diff --git a/tools/ocaml/libs/eventchn/eventchn.mli b/tools/ocaml/libs/eventchn/eventchn.mli
index 7088700c55c0652f3aa0e4047014e0b7a26fa835..291b8c117096d94ccdfa1df72df4f7e939a74343 100644 (file)
--- a/tools/ocaml/libs/eventchn/eventchn.mli
+++ b/tools/ocaml/libs/eventchn/eventchn.mli
@@ -19,7 +19,7 @@ external init : unit -> Unix.file_descr = "stub_eventchn_init"
 external notify : Unix.file_descr -> int -> unit = "stub_eventchn_notify"
 external bind_interdomain : Unix.file_descr -> int -> int -> int
   = "stub_eventchn_bind_interdomain"
-external bind_virq : Unix.file_descr -> int = "stub_eventchn_bind_virq"
+external bind_dom_exc_virq : Unix.file_descr -> int = "stub_eventchn_bind_dom_exc_virq"
 external unbind : Unix.file_descr -> int -> unit = "stub_eventchn_unbind"
 external read_port : Unix.file_descr -> int = "stub_eventchn_read_port"
 external write_port : Unix.file_descr -> int -> unit

diff --git a/tools/ocaml/libs/eventchn/eventchn_stubs.c b/tools/ocaml/libs/eventchn/eventchn_stubs.c
index e5d15911882ee920a4b187bd272e5ee1bcc1c6b7..d64e8913f28c7d4e16849a1df391423ab42cbe90 100644 (file)
--- a/tools/ocaml/libs/eventchn/eventchn_stubs.c
+++ b/tools/ocaml/libs/eventchn/eventchn_stubs.c
@@ -97,7 +97,7 @@ CAMLprim value stub_eventchn_bind_interdomain(value fd, value domid,
        CAMLreturn(port);
 }
 
-CAMLprim value stub_eventchn_bind_virq(value fd)
+CAMLprim value stub_eventchn_bind_dom_exc_virq(value fd)
 {
        CAMLparam1(fd);
        CAMLlocal1(port);

diff --git a/tools/ocaml/xenstored/event.ml b/tools/ocaml/xenstored/event.ml
index 5cbdccf71573309f1f6a0979c0744b2beaf413bc..0e6ed03fe884fedffef99c49595fe8712c2b3d85 100644 (file)
--- a/tools/ocaml/xenstored/event.ml
+++ b/tools/ocaml/xenstored/event.ml
@@ -21,7 +21,7 @@ type t = {
 }
 
 let init () = { fd = Eventchn.init (); virq_port = -1; }
-let bind_virq eventchn = eventchn.virq_port <- Eventchn.bind_virq eventchn.fd
+let bind_dom_exc_virq eventchn = eventchn.virq_port <- Eventchn.bind_dom_exc_virq eventchn.fd
 let bind_interdomain eventchn domid port = Eventchn.bind_interdomain eventchn.fd domid port
 let unbind eventchn port = Eventchn.unbind eventchn.fd port
 let notify eventchn port = Eventchn.notify eventchn.fd port

diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml
index 44223ebe446a992d4226d2163d74e499705538f5..c25a44ad85912245512a558ba3e624abff8c8fc8 100644 (file)
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -270,7 +270,7 @@ let _ =
 
        if cf.restart then (
                DB.from_file store domains cons "/var/run/xenstored/db";
-               Event.bind_virq eventchn
+               Event.bind_dom_exc_virq eventchn
        ) else (
                if !Disk.enable then (
                        info "reading store from disk";
@@ -284,7 +284,7 @@ let _ =
                if cf.domain_init then (
                        let usingxiu = Xc.using_injection () in
                        Connections.add_domain cons (Domains.create0 usingxiu domains);
-                       Event.bind_virq eventchn
+                       Event.bind_dom_exc_virq eventchn
                );
        );