ia64/xen-unstable

changeset 13812:2b4b07391df2

Fix merge conflict between new HVM console handling and new HVM boot handling.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Thu Feb 01 15:31:34 2007 +0000 (2007-02-01)
parents 868babf6b1dd
children 1fb0302683d3
files tools/python/xen/xend/server/vfbif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/vfbif.py	Thu Feb 01 15:30:22 2007 +0000
     1.2 +++ b/tools/python/xen/xend/server/vfbif.py	Thu Feb 01 15:31:34 2007 +0000
     1.3 @@ -46,7 +46,7 @@ class VfbifController(DevController):
     1.4  
     1.5      def createDevice(self, config):
     1.6          DevController.createDevice(self, config)
     1.7 -        if self.vm.info.get('HVM_boot'):
     1.8 +        if self.vm.info.get('HVM_boot_policy'):
     1.9              # is HVM, so qemu-dm will handle the vfb.
    1.10              return
    1.11          
    1.12 @@ -90,7 +90,7 @@ class VfbifController(DevController):
    1.13  
    1.14  
    1.15      def waitForDevice(self, devid):
    1.16 -        if self.vm.info.get('HVM_boot'):
    1.17 +        if self.vm.info.get('HVM_boot_policy'):
    1.18              log.debug('skip waiting for HVM vfb')
    1.19              # is a qemu-dm managed device, don't wait for hotplug for these.
    1.20              return
    1.21 @@ -110,7 +110,7 @@ class VfbifController(DevController):
    1.22          raise VmError('Refusing to reconfigure device vfb:%d' % devid)
    1.23  
    1.24      def destroyDevice(self, devid, force):
    1.25 -        if self.vm.info.get('HVM_boot'):
    1.26 +        if self.vm.info.get('HVM_boot_policy'):
    1.27              # remove the backend xenstore entries for HVM guests no matter
    1.28              # what
    1.29              DevController.destroyDevice(self, devid, True)
    1.30 @@ -119,7 +119,7 @@ class VfbifController(DevController):
    1.31  
    1.32  
    1.33      def migrate(self, deviceConfig, network, dst, step, domName):
    1.34 -        if self.vm.info.get('HVM_boot'):        
    1.35 +        if self.vm.info.get('HVM_boot_policy'):        
    1.36              return 0
    1.37          return DevController.migrate(self, deviceConfig, network, dst, step,
    1.38                                       domName)
    1.39 @@ -136,14 +136,14 @@ class VkbdifController(DevController):
    1.40          return (devid, back, front)
    1.41  
    1.42      def waitForDevice(self, config):
    1.43 -        if self.vm.info.get('HVM_boot'):
    1.44 +        if self.vm.info.get('HVM_boot_policy'):
    1.45              # is a qemu-dm managed device, don't wait for hotplug for these.
    1.46              return
    1.47  
    1.48          DevController.waitForDevice(self, config)
    1.49  
    1.50      def destroyDevice(self, devid, force):
    1.51 -        if self.vm.info.get('HVM_boot'):
    1.52 +        if self.vm.info.get('HVM_boot_policy'):
    1.53              # remove the backend xenstore entries for HVM guests no matter
    1.54              # what
    1.55              DevController.destroyDevice(self, devid, True)
    1.56 @@ -151,7 +151,7 @@ class VkbdifController(DevController):
    1.57              DevController.destroyDevice(self, devid, force)
    1.58  
    1.59      def migrate(self, deviceConfig, network, dst, step, domName):
    1.60 -        if self.vm.info.get('HVM_boot'):        
    1.61 +        if self.vm.info.get('HVM_boot_policy'):        
    1.62              return 0
    1.63          return DevController.migrate(self, deviceConfig, network, dst, step,
    1.64                                       domName)