From b23dece0d29d295f6ee140b96230ed27c7fd1268 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 7 Jan 2011 18:11:41 +0000
Subject: pv/hvm detection with pygrub updated for glance

---
 nova/virt/xenapi/vm_utils.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 074ca9f87..9d333bcea 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -343,6 +343,14 @@ class VMHelper(HelperBase):
 
     @classmethod
     def lookup_image(cls, session, vdi_ref):
+        if FLAGS.xenapi_image_service == 'glance':
+            cls.lookup_image_glance(session, vdi_ref)
+        else:
+            cls.lookup_image_objectstore(session, vdi_ref)
+        return
+
+    @classmethod 
+    def _lookup_image_objectstore(cls,session,vdi_ref):
         logging.debug("Looking up vdi %s for PV kernel", vdi_ref)
         fn = "is_vdi_pv"
         args = {}
@@ -357,6 +365,25 @@ class VMHelper(HelperBase):
         logging.debug("PV Kernel in VDI:%d", pv)
         return pv
 
+    @classmethod 
+    def _lookup_image_glance(cls,session,vdi_ref):
+        logging.debug("Looking up vdi %s for PV kernel", vdi_ref)
+        
+        def is_vdi_pv(dest):
+            logging.debug("Running pygrub against %s",dest)
+            output=os.popen('pygrub -qn %s' % dest)
+            pv=False
+            for line in output.readlines():
+                #try to find kernel string
+                m=re.search('(?<=kernel:)/.*(?:>)',line)
+                if m:
+                    if m.group(0).find('xen')!=-1:
+                        pv=True
+            logging.debug("PV:%d",pv)
+            return pv 
+        pv=with_vdi_attached_here(session, vdi_ref, False, is_vdi_pv)
+        return pv
+     
     @classmethod
     def lookup(cls, session, i):
         """Look the instance i up, and returns it if available"""
-- 
cgit