[Xen-changelog] [xen-unstable] ocaml: rename Evtchn.bind_virq as Evtchn.bind_dom_exc_virq

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1294335286 0
# Node ID 2e1bd6baee287ee56f44fc634af4416ccea576e1
# Parent  9b0b2233f2e6c0846c3d8a3ddbdbdbe2f4b44627
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@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/ocaml/libs/eventchn/eventchn.ml      |    2 +-
 tools/ocaml/libs/eventchn/eventchn.mli     |    2 +-
 tools/ocaml/libs/eventchn/eventchn_stubs.c |    2 +-
 tools/ocaml/xenstored/event.ml             |    2 +-
 tools/ocaml/xenstored/xenstored.ml         |    4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff -r 9b0b2233f2e6 -r 2e1bd6baee28 tools/ocaml/libs/eventchn/eventchn.ml
--- a/tools/ocaml/libs/eventchn/eventchn.ml     Thu Jan 06 17:33:39 2011 +0000
+++ b/tools/ocaml/libs/eventchn/eventchn.ml     Thu Jan 06 17:34:46 2011 +0000
@@ -19,7 +19,7 @@ external init: unit -> Unix.file_descr =
 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 -r 9b0b2233f2e6 -r 2e1bd6baee28 tools/ocaml/libs/eventchn/eventchn.mli
--- a/tools/ocaml/libs/eventchn/eventchn.mli    Thu Jan 06 17:33:39 2011 +0000
+++ b/tools/ocaml/libs/eventchn/eventchn.mli    Thu Jan 06 17:34:46 2011 +0000
@@ -19,7 +19,7 @@ external notify : Unix.file_descr -> int
 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 -r 9b0b2233f2e6 -r 2e1bd6baee28 tools/ocaml/libs/eventchn/eventchn_stubs.c
--- a/tools/ocaml/libs/eventchn/eventchn_stubs.c        Thu Jan 06 17:33:39 
2011 +0000
+++ b/tools/ocaml/libs/eventchn/eventchn_stubs.c        Thu Jan 06 17:34:46 
2011 +0000
@@ -97,7 +97,7 @@ CAMLprim value stub_eventchn_bind_interd
        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 -r 9b0b2233f2e6 -r 2e1bd6baee28 tools/ocaml/xenstored/event.ml
--- a/tools/ocaml/xenstored/event.ml    Thu Jan 06 17:33:39 2011 +0000
+++ b/tools/ocaml/xenstored/event.ml    Thu Jan 06 17:34:46 2011 +0000
@@ -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 -r 9b0b2233f2e6 -r 2e1bd6baee28 tools/ocaml/xenstored/xenstored.ml
--- a/tools/ocaml/xenstored/xenstored.ml        Thu Jan 06 17:33:39 2011 +0000
+++ b/tools/ocaml/xenstored/xenstored.ml        Thu Jan 06 17:34:46 2011 +0000
@@ -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
                );
        );
 

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