Merge pull request xapi-project#2540 from johnelse/ca-193817

CA-193817: Allow GVT-g even when device is hidden from xen/dom0

Author: johnelse

ocaml/xapi/xapi_vgpu_type.ml

@@ -486,18 +486,13 @@ module Intel = struct
 			~is_host_display_enabled
 			~is_pci_hidden =
 		let types =
-			if is_system_display_device
-			then begin
-				match is_host_display_enabled, is_pci_hidden with
-				| false, true -> [passthrough_gpu]
-				| true, true -> []
-				| _, false ->
-					(make_vgpu_types ~__context
-						~pci ~whitelist:!Xapi_globs.gvt_g_whitelist)
-			end else
-				passthrough_gpu ::
-				(make_vgpu_types ~__context
-					~pci ~whitelist:!Xapi_globs.gvt_g_whitelist)
+			let passthrough_types =
+				if is_system_display_device && (is_host_display_enabled || not is_pci_hidden)
+				then []
+				else [passthrough_gpu]
+			in
+			passthrough_types @
+			(make_vgpu_types ~__context ~pci ~whitelist:!Xapi_globs.gvt_g_whitelist)
 		in
 		List.map (find_or_create ~__context) types
 end