Merge pull request #776 from lindig/UPD-825

CA-366014 UPD-825 pass dm qemu to UEFI qemu, too

Author: lindig

xc/device.ml

@@ -49,8 +49,6 @@ module Profile = struct
 
   let fallback = Qemu_upstream_compat
 
-  let all = [Qemu_none; Qemu_upstream_compat; Qemu_upstream]
-
   module Name = struct
     let qemu_none = "qemu-none"
 

xc/device.mli

@@ -40,9 +40,6 @@ module Profile : sig
   (** the fallback profile in case an invalid profile string is provided to
       [of_string] *)
 
-  val all : t list
-  (** all available profiles *)
-
   (** Valid names for a profile, used to define valid values for
       VM.platform.device-model *)
   module Name : sig

xc/domain.ml

@@ -1154,6 +1154,14 @@ let build (task : Xenops_task.task_handle) ~xc ~xs ~store_domid ~console_domid
 
 type suspend_flag = Live | Debug
 
+let dm_flags =
+  let open Device.Profile in
+  function
+  | Qemu_upstream | Qemu_upstream_compat | Qemu_upstream_uefi ->
+      ["-dm"; "qemu"]
+  | Qemu_trad | Qemu_none ->
+      []
+
 let with_emu_manager_restore (task : Xenops_task.task_handle) ~domain_type
     ~(dm : Device.Profile.t) ~store_port ~console_port ~extras manager_path
     domid uuid main_fd vgpu_fd f =
@@ -1185,12 +1193,7 @@ let with_emu_manager_restore (task : Xenops_task.task_handle) ~domain_type
     ; "-console_port"
     ; string_of_int console_port
     ]
-    @ ( match dm with
-      | Device.Profile.Qemu_upstream | Device.Profile.Qemu_upstream_compat ->
-          ["-dm"; "qemu"]
-      | _ ->
-          []
-      )
+    @ dm_flags dm
     @ extras
     @ vgpu_cmdline
   in
@@ -1569,12 +1572,7 @@ let suspend_emu_manager ~(task : Xenops_task.task_handle) ~xc ~xs ~domain_type
   let flags' = List.map cmdline_to_flag flags in
   let args =
     ["-fd"; fd_uuid; "-mode"; mode; "-domid"; string_of_int domid]
-    @ ( match dm with
-      | Device.Profile.Qemu_upstream | Device.Profile.Qemu_upstream_compat ->
-          ["-dm"; "qemu"]
-      | _ ->
-          []
-      )
+    @ dm_flags dm
     @ List.concat flags'
     @ vgpu_cmdline
   in