expose hap as a config option. default to true.

diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index a24a82f48c3168041325f8777e337ae5807506b1..5c9acc55d8f1bc29ddc830564014816ddcd1dfb9 100644 (file)
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -414,7 +414,7 @@ let create_vm xc xs state =
                let info = {
                        Domain.ssidref = 0l;
                        Domain.hvm = state.vm_cfg.hvm;
-                       Domain.hap = state.vm_cfg.hvm;
+                       Domain.hap = state.vm_cfg.hap;
                        Domain.name = "";
                        Domain.platformdata = state.vm_cfg.platform;
                        Domain.xsdata = [];

diff --git a/xenvm/vmconfig.ml b/xenvm/vmconfig.ml
index f818808107534a2860aaef5233516318164ce684..91fd59dfff30a4470bad938052f42ff2feede06e 100644 (file)
--- a/xenvm/vmconfig.ml
+++ b/xenvm/vmconfig.ml
@@ -103,6 +103,7 @@ type config = {
        (* kernel *)
        startup: startupstate;
        hvm: bool;
+       hap: bool;
        kernel: string;
        cmdline: string;
        serial: string;
@@ -437,6 +438,7 @@ exception Unknown_field of string
 let get cfg field =
        match field with
        | "hvm"       -> string_of_bool cfg.hvm
+       | "hap"       -> string_of_bool cfg.hap
        | "kernel"    -> cfg.kernel
        | "cmdline"   -> cfg.cmdline
        | "serial"    -> cfg.serial
@@ -473,6 +475,7 @@ let get cfg field =
 let set cfg field value =
        match field with
        | "hvm"       -> { cfg with hvm = bool_of_string value }
+       | "hap"       -> { cfg with hap = bool_of_string value }
        | "kernel"    -> { cfg with kernel = value }
        | "cmdline"   -> { cfg with cmdline = value }
        | "serial"    -> { cfg with serial = value }
@@ -560,6 +563,7 @@ let empty =
                (* get/set *)
                debug = false;
                hvm = false;
+               hap = true;
                kernel = "";
                cmdline = "";
                serial = "";