[PATCH 3 of 6] REBASE-4.1: vmops: apply CPUID to all domains

[Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>]

# HG changeset patch
# User root-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org
# Date 1290076616 18000
# Node ID 810786855fe641b7db0074cfcb2b2a3a4dfd34a0
# Parent  4b9c3e5d05b045b4b93afa12e78afbef41ca7aa1
REBASE-4.1: vmops: apply CPUID to all domains.

Not just when xenclient is enabled.

I think the indentation was confusing here and the PCI passthrough bit wasn't
actually guarded by Xapi_globs.xenclient_enabled.

Required on newer hypervisor otherwise guest sees all cpuid leafs == 0.

Signed-off-by: Ian Campbell <ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>

diff -r 4b9c3e5d05b0 -r 810786855fe6 ocaml/xapi/vmops.ml
--- a/ocaml/xapi/vmops.ml	Thu Nov 18 05:36:56 2010 -0500
+++ b/ocaml/xapi/vmops.ml	Thu Nov 18 05:36:56 2010 -0500
@@ -1052,11 +1052,10 @@ let start_paused ?(progress_cb = fun _ -
 
 		      let hvm = Helpers.is_hvm snapshot in			
 
-		      if Xapi_globs.xenclient_enabled then 
-			Domain.cpuid_apply ~xc ~hvm domid;
+		      Domain.cpuid_apply ~xc ~hvm domid;
 
-			  (* XXX: PCI passthrough needs a lot of work *)
-			  let pcidevs = (match pcidevs with Some x -> x | None -> pcidevs_of_vm ~__context ~vm) in
+		      (* XXX: PCI passthrough needs a lot of work *)
+		      let pcidevs = (match pcidevs with Some x -> x | None -> pcidevs_of_vm ~__context ~vm) in
 
 		      (* Don't attempt to attach empty VBDs to PV guests: they can't handle them *)
 		      let vbds =