diff options
| author | chotaire <chotaire@chotaire.net> | 2020-01-29 12:11:57 +0100 |
|---|---|---|
| committer | chotaire <chotaire@chotaire.net> | 2020-01-29 12:11:57 +0100 |
| commit | 9bb87a276930ca041846e9b0afe2fff4046b54f4 (patch) | |
| tree | b867634d86f2cef146d877641c7b45d940a97179 /endpoints/lib | |
| parent | 5aa5381a281b05d283282e9d0b9359512eb1262c (diff) | |
| download | phpvirtualbox-9bb87a276930ca041846e9b0afe2fff4046b54f4.zip phpvirtualbox-9bb87a276930ca041846e9b0afe2fff4046b54f4.tar.gz phpvirtualbox-9bb87a276930ca041846e9b0afe2fff4046b54f4.tar.bz2 | |
Merge Nested Virtualization patches
Diffstat (limited to 'endpoints/lib')
| -rw-r--r-- | endpoints/lib/vboxconnector.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/endpoints/lib/vboxconnector.php b/endpoints/lib/vboxconnector.php index 86ad97c..c9f38df 100644 --- a/endpoints/lib/vboxconnector.php +++ b/endpoints/lib/vboxconnector.php @@ -1856,6 +1856,7 @@ class vboxconnector { if($m->snapshotFolder != $args['snapshotFolder']) $m->snapshotFolder = $args['snapshotFolder'];
$m->RTCUseUTC = ($args['RTCUseUTC'] ? 1 : 0);
$m->setCpuProperty('PAE', ($args['CpuProperties']['PAE'] ? 1 : 0));
+ $m->setCpuProperty('HWVirt', ($args['CpuProperties']['HWVirt'] ? 1 : 0));
$m->setCPUProperty('LongMode', (strpos($args['OSTypeId'],'_64') > - 1 ? 1 : 0));
// IOAPIC
@@ -3413,7 +3414,8 @@ class vboxconnector { * Supported CPU features?
*/
$response['cpuFeatures'] = array();
- foreach(array('HWVirtEx'=>'HWVirtEx','PAE'=>'PAE','NestedPaging'=>'Nested Paging','LongMode'=>'Long Mode (64-bit)') as $k=>$v) {
+ foreach(array('HWVirtEx'=>'HWVirtEx','PAE'=>'PAE','NestedPaging'=>'Nested Paging','LongMode'=>'Long Mode (64-bit)'
+ ,'UnrestrictedGuest'=>'Unrestricted Guest','NestedHWVirt'=>'Nested Virtualization') as $k=>$v) {
$response['cpuFeatures'][$v] = $host->getProcessorFeature($k);
}
@@ -4263,7 +4265,7 @@ class vboxconnector { 'VPID' => $m->getHWVirtExProperty('VPID')
),
'CpuProperties' => array(
- 'PAE' => $m->getCpuProperty('PAE')
+ 'PAE' => $m->getCpuProperty('PAE'),'HWVirt' => $m->getCpuProperty('HWVirt')
),
'bootOrder' => $this->_machineGetBootOrder($m),
'chipsetType' => (string)$m->chipsetType,
|