Xen 4.1: Changes and refactoring to cope with our xapi-libs upstreaming move

Signed-off-by: Zheng Li <[email protected]>

Author: zli

ocaml/xapi/xapi.ml

@@ -35,8 +35,8 @@ module W=Debug.Debugger(struct let name="watchdog" end)
 
 let check_control_domain () =
   let domuuid = with_xc (fun xc -> Domain.get_uuid ~xc 0) in
+	let domuuid = Uuid.to_string domuuid in
   let uuid = Xapi_inventory.lookup Xapi_inventory._control_domain_uuid in
-  let uuid = Uuid.of_string uuid in
   if domuuid <> uuid then (
     info "dom0 uuid mismatch with inventory -- setting it the proper value";
     with_xc (fun xc -> Xc.domain_sethandle xc 0 uuid)

ocaml/xenops/domain.ml

@@ -115,7 +115,7 @@ let make ~xc ~xs info uuid =
            ) else
               default_flags
         ) else [] in
-	let domid = Xc.domain_create xc info.ssidref flags uuid in
+	let domid = Xc.domain_create xc info.ssidref flags (Uuid.to_string uuid) in
 	let name = if info.name <> "" then info.name else sprintf "Domain-%d" domid in
 	try
 		let dom_path = xs.Xs.getdomainpath domid in
@@ -370,7 +370,7 @@ let destroy ?(preserve_xs_vm=false) ~xc ~xs domid =
 	  (* CA-13801: to avoid confusing people, we shall change this domain's uuid *)
 	  let s = Printf.sprintf "deadbeef-dead-beef-dead-beef0000%04x" domid in
 	  warn "Domain stuck in dying state after 30s; resetting UUID to %s" s;
-	  Xc.domain_sethandle xc domid (Uuid.of_string s);
+	  Xc.domain_sethandle xc domid s;
 	  raise (Domain_stuck_in_dying_state domid)
 	end
 

ocaml/xenops/tests.ml

@@ -179,7 +179,7 @@ let test_xal2 () =
 
 let test_domain_creation xc =
 	assert_nodomain xc;
-	let uuid = Uuid.make_uuid () in
+	let uuid = Uuid.to_string (Uuid.make_uuid ()) in
 	let domid = Xc.domain_create xc 0l false uuid in
 	Xc.domain_destroy xc domid;
 	assert_nodomain xc