54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1201619795 0
|
|
# Node ID 233f40973e1d689d66b25e439b2f48524dd579ea
|
|
# Parent 04e24b9dcc1649e86d3e94a81489dab9c6ec82bc
|
|
xend: Fix building PV guests after introducing new HVM-HAP config option.
|
|
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
|
|
|
|
Index: xen-3.2.1-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-3.2.1-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -1590,4 +1590,4 @@ class XendConfig(dict):
|
|
return stored_type or (self.is_hvm() and 'hvm' or 'linux')
|
|
|
|
def is_hap(self):
|
|
- return self['platform']['hap']
|
|
+ return self['platform'].get('hap', 0)
|
|
Index: xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -1624,19 +1624,14 @@ class XendDomainInfo:
|
|
@raise: VmError on error
|
|
"""
|
|
|
|
- hvm_bit_offset = 0
|
|
-
|
|
- hap_bit_offset = 1
|
|
-
|
|
log.debug('XendDomainInfo.constructDomain')
|
|
|
|
self.shutdownStartTime = None
|
|
|
|
+ hap = 0
|
|
hvm = self.info.is_hvm()
|
|
-
|
|
- hap = self.info.is_hap()
|
|
-
|
|
if hvm:
|
|
+ hap = self.info.is_hap()
|
|
info = xc.xeninfo()
|
|
if 'hvm' not in info['xen_caps']:
|
|
raise VmError("HVM guest support is unavailable: is VT/AMD-V "
|
|
@@ -1661,7 +1656,7 @@ class XendDomainInfo:
|
|
domid = 0,
|
|
ssidref = ssidref,
|
|
handle = uuid.fromString(self.info['uuid']),
|
|
- flags = int((hvm << hvm_bit_offset) | (hap << hap_bit_offset)))
|
|
+ flags = int((hvm << 0) | (hap << 1)))
|
|
except Exception, e:
|
|
# may get here if due to ACM the operation is not permitted
|
|
if security.on():
|