@@ -22,7 +22,6 @@ let warn fmt = Logging.warn "domain" fmt
type t =
{
id: Xenctrl.domid;
- mfn: nativeint;
interface: Xenmmap.t;
eventchn: Event.t;
mutable remote_port: int;
@@ -40,7 +39,6 @@ type t =
let is_dom0 d = d.id = 0
let get_id domain = domain.id
let get_interface d = d.interface
-let get_mfn d = d.mfn
let get_remote_port d = d.remote_port
let get_port d = d.port
@@ -61,7 +59,7 @@ let string_of_port = function
| Some x -> string_of_int (Xeneventchn.to_int x)
let dump d chan =
- fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.remote_port
+ fprintf chan "dom,%d,%d\n" d.id d.remote_port
let notify dom = match dom.port with
| None ->
@@ -87,9 +85,8 @@ let close dom =
Xenmmap.unmap dom.interface;
()
-let make id mfn remote_port interface eventchn = {
+let make id remote_port interface eventchn = {
id = id;
- mfn = mfn;
remote_port = remote_port;
interface = interface;
eventchn = eventchn;
@@ -124,10 +124,10 @@ let cleanup doms =
let resume _doms _domid =
()
-let create doms domid mfn port =
+let create doms domid port =
let mapping = Gnt.(Gnttab.map_exn doms.gnttab { domid; ref = xenstore} true) in
let interface = Gnt.Gnttab.Local_mapping.to_pages doms.gnttab mapping in
- let dom = Domain.make domid mfn port interface doms.eventchn in
+ let dom = Domain.make domid port interface doms.eventchn in
Hashtbl.add doms.table domid dom;
Domain.bind_interdomain dom;
dom
@@ -147,7 +147,7 @@ let create0 doms =
port, interface
)
in
- let dom = Domain.make 0 Nativeint.zero port interface doms.eventchn in
+ let dom = Domain.make 0 port interface doms.eventchn in
Hashtbl.add doms.table 0 dom;
Domain.bind_interdomain dom;
Domain.notify dom;
@@ -235,10 +235,6 @@ let do_debug con t _domains cons data =
| "watches" :: _ ->
let watches = Connections.debug cons in
Some (watches ^ "\000")
- | "mfn" :: domid :: _ ->
- let domid = int_of_string domid in
- let con = Connections.find_domain cons domid in
- may (fun dom -> Printf.sprintf "%nd\000" (Domain.get_mfn dom)) (Connection.get_domain con)
| _ -> None
with _ -> None
@@ -554,15 +550,13 @@ let do_introduce con t domains cons data =
let dom =
if Domains.exist domains domid then begin
let edom = Domains.find domains domid in
- if (Domain.get_mfn edom) = mfn && (Connections.find_domain cons domid) != con then begin
- (* Use XS_INTRODUCE for recreating the xenbus event-channel. *)
- edom.remote_port <- port;
- Domain.bind_interdomain edom;
- end;
+ (* Use XS_INTRODUCE for recreating the xenbus event-channel. *)
+ edom.remote_port <- port;
+ Domain.bind_interdomain edom;
edom
end
else try
- let ndom = Domains.create domains domid mfn port in
+ let ndom = Domains.create domains domid port in
Connections.add_domain cons ndom;
Connections.fire_spec_watches (Transaction.get_root t) cons Store.Path.introduce_domain;
ndom
@@ -571,7 +565,7 @@ let do_introduce con t domains cons data =
Logging.debug "process" "do_introduce: %s (%s)" (Printexc.to_string e) bt;
raise Invalid_Cmd_Args
in
- if (Domain.get_remote_port dom) <> port || (Domain.get_mfn dom) <> mfn then
+ if (Domain.get_remote_port dom) <> port then
raise Domain_not_match
let do_release con t domains cons data =
This is a port of the following C xenstored commit 122b52230aa5b79d65e18b8b77094027faa2f8e2 tools/xenstore: don't store domU's mfn of ring page in xenstored Backwards compat: accept a domain dump both with and without MFN. CC: Juergen Gross <jgross@suse.com> Signed-off-by: Edwin Török <edvin.torok@citrix.com> --- tools/ocaml/xenstored/domain.ml | 7 ++----- tools/ocaml/xenstored/domains.ml | 6 +++--- tools/ocaml/xenstored/process.ml | 16 +++++----------- 3 files changed, 10 insertions(+), 19 deletions(-)