Xen 4.1: xenguest updates for Xen4

Signed-off-by: Ian Campbell <[email protected]>
Signed-off-by: Zheng Li <[email protected]>

Author: zli

ocaml/xapi/vmops.ml

@@ -303,7 +303,7 @@ let general_domain_create_check ~__context ~vm ~snapshot =
     key/value pairs representing the VM's vCPU configuration. *)
 let vcpu_configuration snapshot = 
   let vcpus = Int64.to_int snapshot.API.vM_VCPUs_max in
-
+  let vcpus_current = Int64.to_int snapshot.API.vM_VCPUs_at_startup in
   let pcpus = with_xc (fun xc -> (Xc.physinfo xc).Xc.max_nr_cpus) in
   debug "xen reports max %d pCPUs" pcpus;
 
@@ -326,7 +326,8 @@ let vcpu_configuration snapshot =
   let weight = Opt.map (fun x -> [ "vcpu/weight", string_of_int x ]) weight in
   let cap = Opt.map (fun x -> [ "vcpu/cap", string_of_int x ]) cap in
 
-  [ "vcpu/number", string_of_int vcpus ]
+  [ "vcpu/number", string_of_int vcpus;
+    "vcpu/current", string_of_int vcpus_current ]
   @ (Opt.default [] affinity)
   @ (Opt.default [] weight)
   @ (Opt.default [] cap)

ocaml/xenguest/OMakefile

@@ -5,9 +5,9 @@ OCAML_CLIBS = xenguest_stubs
 OCAML_LINK_FLAGS += $(XEN_OCAML_LINK_FLAGS) -cclib -L$(XEN_ROOT)/usr/$(LIBDIR) -cclib -lz -cclib -lxenguest -cclib -lxenctrl -cclib -lxenstore
 OCAMLPACKS = unix
 
-XENGUEST_SRC_FILES = dumpcore.ml xenguest.ml xenguest_main.ml xenguest_stubs.c save_helpers.c
+XENGUEST_SRC_FILES = dumpcore.ml xenguest.ml xenguest_main.ml xenguest_stubs.c
 
-StaticCLibrary(xenguest_stubs, save_helpers xenguest_stubs)
+StaticCLibrary(xenguest_stubs, xenguest_stubs)
 OCamlLibraryClib(xenguest, xenguest, xenguest_stubs)
 
 section

ocaml/xenguest/save_helpers.c

@@ -29,8 +29,8 @@ external linux_build : handle -> domid -> int -> int -> string ->
 	= "stub_xc_linux_build_bytecode" "stub_xc_linux_build_native"
 
 (** build a hvm domain *)
-external hvm_build : handle -> domid -> int -> int -> string ->
-                     int -> nativeint
+external hvm_build : handle -> domid -> int -> int -> string -> int -> int ->
+	(nativeint * nativeint)
 	= "stub_xc_hvm_build_bytecode" "stub_xc_hvm_build_native"
 
 (** resume an uncooperative domain *)

ocaml/xenguest/xenguest.ml

@@ -238,12 +238,13 @@ let linux_build_real domid mem_max_mib mem_start_mib image ramdisk cmdline featu
 		                    Nativeint.to_string console_mfn; proto ]
 	)
 
-let hvm_build_real domid mem_max_mib mem_start_mib image store_port =
+let hvm_build_real domid mem_max_mib mem_start_mib image store_port console_port=
 	with_xenguest (fun xc ->
-		let store_mfn =
+		let store_mfn, console_mfn =
 			Xenguest.hvm_build xc domid mem_max_mib mem_start_mib image
-			                   store_port in
-		Nativeint.to_string store_mfn
+			                   store_port console_port in
+		String.concat " " [Nativeint.to_string store_mfn;
+		                   Nativeint.to_string console_mfn]
 	)
 
 let domain_save_real fd domid x y flags hvm =
@@ -263,14 +264,14 @@ let domain_restore_real fd domid store_port console_port hvm =
 
 (** fake operations *)
 let linux_build_fake domid mem_max_mib mem_start_mib image ramdisk cmdline features flags store_port console_port = "10 10 x86-32"
-let hvm_build_fake domid mem_max_mib mem_start_mib image store_port = "2901"
+let hvm_build_fake domid mem_max_mib mem_start_mib image store_port console_port = "2901 2901"
 let domain_save_fake fd domid x y flags hvm = Unix.sleep 1; ignore (suspend_callback domid); ""
 let domain_restore_fake fd domid store_port console_port hvm = "10 10"
 
 (** operation vector *)
 type ops = {
 	linux_build: int -> int -> int -> string -> string option -> string -> string -> int -> int -> int -> string;
-	hvm_build: int -> int -> int -> string -> int -> string;
+	hvm_build: int -> int -> int -> string -> int -> int -> string;
 	domain_save: Unix.file_descr -> int -> int -> int -> Xenguest.suspend_flags list -> bool -> string;
 	domain_restore: Unix.file_descr -> int -> int -> int -> bool -> string;
 }
@@ -402,15 +403,17 @@ let _ =
 		                          cmdline features flags store_port console_port)
 	      | Some "hvm_build" ->
 		  debug "hvm_build mode selected";
-		  require [ "domid"; "mem_max_mib"; "mem_start_mib"; "image"; "store_port" ];
+		      require [ "domid"; "mem_max_mib"; "mem_start_mib"; "image";
+		                "store_port"; "console_port" ];
 		  let domid = int_of_string (get_param "domid")
 		  and mem_max_mib = int_of_string (get_param "mem_max_mib")
 		  and mem_start_mib = int_of_string (get_param "mem_start_mib")
 		  and image = get_param "image"
-		  and store_port = int_of_string (get_param "store_port") in
+		  and store_port = int_of_string (get_param "store_port")
+	    and console_port = int_of_string (get_param "console_port") in
 
 		  with_logging (fun () -> ops.hvm_build domid mem_max_mib mem_start_mib image
-		                          store_port)
+			  store_port console_port)
 	      | Some "test" ->
 		  debug "test mode selected";
 		  with_logging (fun () -> ignore(Unix.system "/tmp/test"); "result")