add support to start qemu for framebuffer on pv

diff --git a/xenops/device.ml b/xenops/device.ml
index 9d0369cd6093a9834a0b5df7140c1d4953330860..11fef21d2ffb2d3169d02d1cb4ea6141130bb5cf 100644 (file)
--- 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 b083ad47e0d02756951f21b6fd025679d188ccca..af65f570e751726cf8fa6bfadb0863a3ed5add90 100644 (file)
--- 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 035e216565691f5add33cbc20dfbdc0aedcbc3f3..7baa170f9b05fb2415a666dd743ba846eaa691a4 100644 (file)
--- 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 a4e2637dadae6356acf33c564d28180422e17033..2fdde5d2febce9c97e987cc92d0146025209ba57 100644 (file)
--- 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 c8189c8e148b44b6c33e44e26d130cccf37a0624..ff53ae785dbc5ab778a9783993a8979b829cd8f0 100644 (file)
--- 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";