Merge branch 'master' into ovmf

OpenXT · Sep 18, 2018 · e944db2 · e944db2
2 parents ceb3d7e + 7bb9232
commit e944db2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/dist/script/models/vmModel.js b/dist/script/models/vmModel.js
@@ -58,7 +58,7 @@ XenClient.UI.VMModel = function(vm_path) {
     this.stubdom = false;
     this.viridian = true;
     this.bios = "seabios";
-    this.hvm = true;
+    this.virt_type= "hvm";
     this.kernel = "";
     this.kernel_extract = "";
     this.cmd_line = "";
@@ -151,7 +151,7 @@ XenClient.UI.VMModel = function(vm_path) {
         ["policy_audio_recording",              interfaces.vm],
         ["stubdom",                             interfaces.vm],
         ["viridian",                            interfaces.vm],
-        ["hvm",                                 interfaces.vm],
+        ["virt_type",                           interfaces.vm],
         ["bios",                                interfaces.vm],
         ["kernel",                              interfaces.vm],
         ["kernel_extract",                      interfaces.vm],

diff --git a/widgets/xenclient/nls/VMDetails.js b/widgets/xenclient/nls/VMDetails.js
@@ -104,7 +104,10 @@
     USB_POLICY: "USB Access:",
     STUB_DOMAIN: "Stub Domain:",
     VIRIDIAN: "Emulate Microsoft Hyper-V:",
-    HVM: "Hardware Virtual Machine:",
+    VIRT_TYPE: "Xen Virtualization Mode:",
+    PV: "PV: Paravirtualized Virtual Machine",
+    PVH: "PVH: Paravirtualized Hardware Virtual Machine",
+    HVM: "HVM: Hardware Virtual Machine",
     BIOS: "BIOS:",
     BIOS_OVMF: "UEFI",
     BIOS_SEABIOS: "Legacy",

diff --git a/widgets/xenclient/templates/VMDetails.html b/widgets/xenclient/templates/VMDetails.html
@@ -371,8 +371,8 @@ <h1>${VIRTUAL_TITLE}</h1>
                         <span class="value" dojoType="citrix.common.EditableWidget" editor="citrix.common.Select" map="{'${ENABLED}': true, '${DISABLED}': false}" name="viridian"></span>
                     </div>
                     <div class="citrixTabPaneField">
-                        <label for="hvm">${HVM}</label>
-                        <span class="value" dojoType="citrix.common.EditableWidget" editor="citrix.common.Select" map="{'${ENABLED}': true, '${DISABLED}': false}" name="hvm"></span>
+                        <label for="virt_type">${VIRT_TYPE}</label>
+			<span class='value' dojoType='citrix.common.EditableWidget' editor='citrix.common.Select' map="{'${HVM}': 'hvm', '${PV}': 'pv', '${PVH}': 'pvh'}" name='virt_type'></span>
                     </div>
                     <div class="citrixTabPaneField">
                         <label for="bios">${BIOS}</label>