From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Thu, 30 Jul 2009 13:49:06 +0000 (+0100)
Subject: add support to start qemu for framebuffer on pv
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5924903c4507474148c527b869b683f52a7b4db3;p=xenclient%2Ftoolstack.git

add support to start qemu for framebuffer on pv
---

diff --git a/xenops/device.ml b/xenops/device.ml
index 9d0369c..11fef21 100644
--- a/xenops/device.ml
+++ b/xenops/device.ml
@@ -1063,6 +1063,7 @@ type disp_opt =
 	| SDL of string (* X11 display *)
 
 type info = {
+	hvm: bool;
 	memory: int64;
 	boot: string;
 	serial: string;
@@ -1179,7 +1180,9 @@ let __start ~xs ~dmpath ~restore ?(timeout=qemu_dm_ready_timeout) info domid =
 		  "-boot"; info.boot;
 		  "-serial"; info.serial;
 		  "-vcpus"; string_of_int info.vcpus;
-	          "-videoram"; string_of_int info.videoram; ]
+	          "-videoram"; string_of_int info.videoram;
+	          "-M"; (if info.hvm then "xenfv" else "xenpv");
+	]
 	   @ disp_options @ sound_options @ usb' @ (List.concat nics')
 	   @ (if info.acpi then [ "-acpi" ] else [])
 	   @ (if restore then [ "-loadvm"; restorefile ] else [])
diff --git a/xenops/device.mli b/xenops/device.mli
index b083ad4..af65f57 100644
--- a/xenops/device.mli
+++ b/xenops/device.mli
@@ -145,6 +145,7 @@ sig
 		| SDL of string (* X11 display *)
 
 	type info = {
+		hvm: bool;
 		memory: int64;
 		boot: string;
 		serial: string;
diff --git a/xenops/device_common.ml b/xenops/device_common.ml
index 035e216..7baa170 100644
--- a/xenops/device_common.ml
+++ b/xenops/device_common.ml
@@ -101,6 +101,7 @@ let device_of_backend (backend: endpoint) (domu: Xc.domid) =
 		   kind = (match backend.kind with
 			   | Vbd | Tap -> Vbd
 			   | Vif -> Vif
+			   | Vfb -> Vfb
 			   | Pci -> Pci);
 		   devid = backend.devid } in
   { backend = backend; frontend = frontend }
diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index a4e2637..2fdde5d 100644
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -192,6 +192,7 @@ let dm_info_of_cfg cfg =
 		| _    -> Device.Dm.VNC (false, cfg.vnc, cfg.vnc_keymap)
 		in
 	{
+		Device.Dm.hvm = cfg.hvm;
 		Device.Dm.memory = cfg.memory;
 		Device.Dm.boot = cfg.boot;
 		Device.Dm.serial = if cfg.serial = "" then "pty" else cfg.serial;
diff --git a/xenvm/xenops.ml b/xenvm/xenops.ml
index c8189c8..ff53ae7 100644
--- a/xenvm/xenops.ml
+++ b/xenvm/xenops.ml
@@ -295,6 +295,7 @@ let bind_pci ~pci =
 let add_dm ~xs ~domid ~mem_max_kib ~vcpus ~boot =
 	let dmpath = "/opt/xensource/libexec/qemu-dm-wrapper" in
 	let info = {
+		Device.Dm.hvm = true;
 		Device.Dm.memory = mem_max_kib;
 		Device.Dm.boot = boot;
 		Device.Dm.serial = "pty";