Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: update reporting for missing VT-x

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-09 03:46:53 +01:00
parent 869675c15c
commit 393bb00471
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core-modules/01QubesHVm.py
View File

@ -31,6 +31,7 @@ import sys
import re import re
import shutil import shutil
import stat import stat
from xml.etree import ElementTree
from qubes.qubes import QubesVm,register_qubes_vm_class,vmm,dry_run from qubes.qubes import QubesVm,register_qubes_vm_class,vmm,dry_run
from qubes.qubes import system_path,defaults from qubes.qubes import system_path,defaults
@ -371,7 +372,10 @@ class QubesHVm(QubesVm):
kwargs['mem_required'] = (self.memory + 32) * 1024 * 1024 kwargs['mem_required'] = (self.memory + 32) * 1024 * 1024
return super(QubesHVm, self).start(*args, **kwargs) return super(QubesHVm, self).start(*args, **kwargs)
except QubesException as e: except QubesException as e:
if xc.physinfo()['virt_caps'].count('hvm') == 0: capabilities = vmm.libvirt_conn.getCapabilities()
tree = ElementTree.fromstring(capabilities)
os_types = tree.findall('./guest/os_type')
if 'hvm' not in map(lambda x: x.text, os_types):
raise QubesException("Cannot start HVM without VT-x/AMD-v enabled") raise QubesException("Cannot start HVM without VT-x/AMD-v enabled")
else: else:
raise raise