Skip to content

Commit

Permalink
Merge pull request #49 from jandryuk/pvh
Browse files Browse the repository at this point in the history
OXT-1383: Switch to virt_type for PVH support
  • Loading branch information
jean-edouard authored Sep 18, 2018
2 parents b0490a4 + 66d5f9e commit 7bb9232
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions dist/script/models/vmModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ XenClient.UI.VMModel = function(vm_path) {
this.usb_enabled = true;
this.stubdom = false;
this.viridian = true;
this.hvm = true;
this.virt_type= "hvm";
this.kernel = "";
this.kernel_extract = "";
this.cmd_line = "";
Expand Down Expand Up @@ -150,7 +150,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],
["kernel", interfaces.vm],
["kernel_extract", interfaces.vm],
["cmd_line", interfaces.vm],
Expand Down
5 changes: 4 additions & 1 deletion widgets/xenclient/nls/VMDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
KERNEL: "Kernel Path:",
KERNEL_EXTRACT: "Kernel Extraction Path:",
COMMAND_LINE: "Command Line:",
Expand Down
4 changes: 2 additions & 2 deletions widgets/xenclient/templates/VMDetails.html
Original file line number Diff line number Diff line change
Expand Up @@ -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="kernel">${KERNEL}</label>
Expand Down

0 comments on commit 7bb9232

Please sign in to comment.