From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 29 Jan 2008 15:16:35 +0000 (+0000)
Subject: xend: Fix building PV guests after introducing new HVM-HAP config option.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14356
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=34d2cb5d8d8cbf8a469048ac6e7af831c105274b;p=xen.git

xend: Fix building PV guests after introducing new HVM-HAP config option.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index f543e93f26..3a1419cbdc 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -1595,4 +1595,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)
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index ca3083bae2..fc8f073ec8 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1626,19 +1626,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 "
@@ -1663,7 +1658,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)),
                 target = self.info.target())
         except Exception, e:
             # may get here if due to ACM the operation is not permitted