CA-40022: add a bunch more debugging and sanity-checks to the console code.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/ocaml/database/db_names.ml b/ocaml/database/db_names.ml
index 8479811e53900a2f0ba1aa6a105569de8430ad47..82b2b6fc617ddea888bac9f69e0799358f0197bb 100644 (file)
--- a/ocaml/database/db_names.ml
+++ b/ocaml/database/db_names.ml
@@ -16,6 +16,7 @@ let uuid = "uuid"
 let ref = "_ref"
 let suspend_VDI = "suspend_VDI"
 let vm = "VM"
+let console = "console"
 let name_label = "name__label"
 let power_state = "power_state"
 let allowed_operations = "allowed_operations"

diff --git a/ocaml/xenops/device.ml b/ocaml/xenops/device.ml
index 1683df635702200db4283f0a03bea416409116ea..f5584dbbf1c4b46e681cf69dcf9f7950775fac2f 100644 (file)
--- a/ocaml/xenops/device.ml
+++ b/ocaml/xenops/device.ml
@@ -1670,3 +1670,8 @@ let vnc_port_path ~xc ~xs domid =
   if (Xc.domain_getinfo xc domid).Xc.hvm_guest
   then Dm.vnc_port_path domid
   else PV_Vnc.vnc_port_path domid
+
+let vnc_port_path ~xc ~xs domid = 
+  if (Xc.domain_getinfo xc domid).Xc.hvm_guest
+  then Dm.vnc_port_path domid
+  else PV_Vnc.vnc_port_path domid