Make default vbd-backend vbd3

djs55 · Jan 29, 2014 · cd4c613 · cd4c613
1 parent 314e79e
commit cd4c613
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/xc/device.ml b/xc/device.ml
@@ -481,7 +481,7 @@ type t = {
 
 let device_kind_of_backend_keys backend_keys =
 	try Device_common.vbd_kind_of_string (List.assoc "backend-kind" backend_keys)
-	with Not_found -> Device_common.default_vbd_kind
+	with Not_found -> Device_common.default_vbd_backend_kind
 
 let add_async ~xs ~hvm x domid =
 	let back_tbl = Hashtbl.create 16 and front_tbl = Hashtbl.create 16 in

diff --git a/xc/device_common.ml b/xc/device_common.ml
@@ -44,7 +44,8 @@ open D
 open Printf
 
 let supported_vbd_backends = [ "vbd"; "vbd3" ] (* TODO: get from xenopsd config *)
-let default_vbd_kind = Vbd "vbd"
+let default_vbd_backend_kind = Vbd "vbd3"
+let default_vbd_frontend_kind = Vbd "vbd"
 let vbd_kind_of_string backend_kind =
 	if List.mem backend_kind supported_vbd_backends then Vbd backend_kind
 	else Vbd "unsupported"
@@ -133,7 +134,7 @@ let string_of_device (x: device) =
 let device_of_backend (backend: endpoint) (domu: Xenctrl.domid) = 
   let frontend = { domid = domu;
 		   kind = (match backend.kind with
-			   | Tap | Vbd _ -> default_vbd_kind (* frontend doesn't use vbd3 *)
+			   | Tap | Vbd _ -> default_vbd_frontend_kind
 			   | _ -> backend.kind);
 		   devid = backend.devid } in
   { backend = backend; frontend = frontend }

diff --git a/xc/device_common.mli b/xc/device_common.mli
@@ -14,7 +14,8 @@
 
 type kind = Vif | Tap | Pci | Vfs | Vfb | Vkbd | Vbd of string
 val vbd_kind_of_string : string -> kind
-val default_vbd_kind : kind
+val default_vbd_backend_kind : kind
+val default_vbd_frontend_kind : kind
 
 type devid = int