CP-31450: Add domid to Datapath.attach

We now honour the existing API of Datapath.attach by
passing the domid of vm that the vbd is being attached to.

This will enable a qemu process per vm.

Signed-off-by: ben sims <[email protected]>

Author: BenSimsCitrix

main.ml

@@ -528,7 +528,7 @@ let vdi_of_volume x =
     persistent = true;
   }
 
-let choose_datapath ?(persistent = true) response =
+let choose_datapath ?(persistent = true) domain response =
   (* We can only use a URI with a valid scheme, since we use the scheme
      to name the datapath plugin. *)
   let possible =
@@ -558,7 +558,7 @@ let choose_datapath ?(persistent = true) response =
       supports_nonpersistent @ others in
   match preference_order with
   | [] -> return (Error (missing_uri ()))
-  | (script_dir, scheme, u) :: us -> return (Ok (fork_exec_rpc ~script_dir, scheme, u, "0"))
+  | (script_dir, scheme, u) :: us -> return (Ok (fork_exec_rpc ~script_dir, scheme, u, domain))
 
 
 (* Bind the implementations *)
@@ -601,7 +601,7 @@ let bind ~volume_script_dir =
       Deferred.Result.return { response with keys = (key, value) :: response.keys }
   in
 
-  let vdi_attach_common dbg sr vdi =
+  let vdi_attach_common dbg sr vdi domain =
     let open Deferred.Result.Monad_infix in
     Attached_SRs.find sr
     >>= fun sr ->
@@ -615,7 +615,7 @@ let bind ~volume_script_dir =
       | Some temporary ->
         stat ~dbg ~sr ~vdi:temporary
     ) >>= fun response ->
-    choose_datapath response
+    choose_datapath domain response
     >>= fun (rpc, datapath, uri, domain) ->
     return_data_rpc (fun () -> Datapath_client.attach rpc dbg uri domain)
   in
@@ -976,10 +976,11 @@ let bind ~volume_script_dir =
   in
   S.VDI.introduce vdi_introduce_impl;
 
-  let vdi_attach2_impl dbg _dp sr vdi' _readwrite =
+  let vdi_attach3_impl dbg _dp sr vdi' vm' _readwrite =
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
-      vdi_attach_common dbg sr vdi >>>= fun response ->
+      let domain = Storage_interface.Vm.string_of vm' in 
+      vdi_attach_common dbg sr vdi domain >>>= fun response ->
       let convert_implementation = function
         | Xapi_storage.Data.XenDisk { params; extra; backend_type } -> Storage_interface.XenDisk { params; extra; backend_type }
         | BlockDevice { path } -> BlockDevice { path }
@@ -989,11 +990,12 @@ let bind ~volume_script_dir =
       Deferred.Result.return { Storage_interface.implementations = List.map ~f:convert_implementation response.Xapi_storage.Data.implementations }
     end |> wrap
   in
-  S.VDI.attach2 vdi_attach2_impl;
+  S.VDI.attach3 vdi_attach3_impl;
 
-  let vdi_activate_impl dbg _dp sr vdi' =
+  let vdi_activate3_impl dbg _dp sr vdi' vm'=
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
+      let domain = Storage_interface.Vm.string_of vm' in 
       Attached_SRs.find sr >>>= fun sr ->
       (* Discover the URIs using Volume.stat *)
       stat ~dbg ~sr ~vdi >>>= fun response ->
@@ -1004,16 +1006,17 @@ let bind ~volume_script_dir =
         | Some temporary ->
           stat ~dbg ~sr ~vdi:temporary
       ) >>>= fun response ->
-      choose_datapath response
+      choose_datapath domain response
       >>>= fun (rpc, datapath, uri, domain) ->
       return_data_rpc (fun () -> Datapath_client.activate rpc dbg uri domain)
     end |> wrap
   in
-  S.VDI.activate vdi_activate_impl;
+  S.VDI.activate3 vdi_activate3_impl;
 
-  let vdi_deactivate_impl dbg _dp sr vdi' =
+  let vdi_deactivate_impl dbg _dp sr vdi' vm'=
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
+      let domain = Storage_interface.Vm.string_of vm' in 
       Attached_SRs.find sr >>>= fun sr ->
       (* Discover the URIs using Volume.stat *)
       stat ~dbg ~sr ~vdi >>>= fun response ->
@@ -1022,15 +1025,16 @@ let bind ~volume_script_dir =
           return (Ok response)
         | Some temporary ->
           stat ~dbg ~sr ~vdi:temporary) >>>= fun response ->
-      choose_datapath response >>>= fun (rpc, datapath, uri, domain) ->
+      choose_datapath domain response >>>= fun (rpc, datapath, uri, domain) ->
       return_data_rpc (fun () -> Datapath_client.deactivate rpc dbg uri domain)
     end |> wrap
   in
   S.VDI.deactivate vdi_deactivate_impl;
 
-  let vdi_detach_impl dbg _dp sr vdi' =
+  let vdi_detach_impl dbg _dp sr vdi' vm'=
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
+      let domain = Storage_interface.Vm.string_of vm' in 
       Attached_SRs.find sr >>>= fun sr ->
       (* Discover the URIs using Volume.stat *)
       stat ~dbg ~sr ~vdi >>>= fun response ->
@@ -1039,7 +1043,7 @@ let bind ~volume_script_dir =
           return (Ok response)
         | Some temporary ->
           stat ~dbg ~sr ~vdi:temporary) >>>= fun response ->
-      choose_datapath response >>>= fun (rpc, datapath, uri, domain) ->
+      choose_datapath domain response >>>= fun (rpc, datapath, uri, domain) ->
       return_data_rpc (fun () -> Datapath_client.detach rpc dbg uri domain)
     end |> wrap
   in
@@ -1066,13 +1070,14 @@ let bind ~volume_script_dir =
   in
   S.SR.stat sr_stat_impl;
 
-  let vdi_epoch_begin_impl dbg sr vdi' persistent =
+  let vdi_epoch_begin_impl dbg sr vdi' vm' persistent =
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
+      let domain = Storage_interface.Vm.string_of vm' in 
       Attached_SRs.find sr >>>= fun sr ->
       (* Discover the URIs using Volume.stat *)
       stat ~dbg ~sr ~vdi >>>= fun response ->
-      choose_datapath ~persistent response >>>= fun (rpc, datapath, uri, domain) ->
+      choose_datapath ~persistent domain response >>>= fun (rpc, datapath, uri, domain) ->
       (* If non-persistent and the datapath plugin supports NONPERSISTENT
          then we delegate this to the datapath plugin. Otherwise we will
          make a temporary clone now and attach/detach etc this file. *)
@@ -1096,13 +1101,14 @@ let bind ~volume_script_dir =
   in
   S.VDI.epoch_begin vdi_epoch_begin_impl;
 
-  let vdi_epoch_end_impl dbg sr vdi' =
+  let vdi_epoch_end_impl dbg sr vdi' vm' =
     begin
       let vdi = Storage_interface.Vdi.string_of vdi' in
+      let domain = Storage_interface.Vm.string_of vm' in 
       Attached_SRs.find sr >>>= fun sr ->
       (* Discover the URIs using Volume.stat *)
       stat ~dbg ~sr ~vdi >>>= fun response ->
-      choose_datapath response >>>= fun (rpc, datapath, uri, domain) ->
+      choose_datapath domain response >>>= fun (rpc, datapath, uri, domain) ->
       if Datapath_plugins.supports_feature datapath _nonpersistent then begin
         return_data_rpc (fun () -> Datapath_client.close rpc dbg uri)
       end else begin
@@ -1152,6 +1158,8 @@ let bind ~volume_script_dir =
   S.TASK.cancel u;
   S.SR.list u;
   S.VDI.attach u;
+  S.VDI.attach2 u;
+  S.VDI.activate u;
   S.DATA.MIRROR.stat u;
   S.TASK.list u;
   S.VDI.get_url u;