diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 14:42:52 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-11 14:42:52 +0000 |
| commit | 81375c4b062c25871e2af0b45977b4a0a2141250 (patch) | |
| tree | ed5bf2849eb72142663b8c4029036c855cb2c545 /tools | |
| parent | 25c2136e0d717a4ca0275efe5270e0f9da2c7aea (diff) | |
| download | xen-81375c4b062c25871e2af0b45977b4a0a2141250.tar.gz xen-81375c4b062c25871e2af0b45977b4a0a2141250.tar.bz2 xen-81375c4b062c25871e2af0b45977b4a0a2141250.zip | |
xend: Better support for legacy HVM config with hvmloader configured
via the 'kernel' config option:
1. Look for any string containing 'hvmloader'.
2. The 'kernel' option must be scrubbed to avoid taking
PV-kernel-loading paths during later guest setup.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/xend/XendConfig.py | 10 | ||||
| -rw-r--r-- | tools/python/xen/xend/image.py | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 1eb7ee78ca..5c76e02650 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -406,15 +406,13 @@ class XendConfig(dict): if self.is_hvm(): if 'loader' not in self['platform']: - log.debug("No loader present") - # Old configs may have hvmloder set as PV_kernel param, - # so lets migrate them.... - if self['PV_kernel'] == "/usr/lib/xen/boot/hvmloader": + # Old configs may have hvmloader set as PV_kernel param + if self.has_key('PV_kernel') and re.search('hvmloader', self['PV_kernel']): self['platform']['loader'] = self['PV_kernel'] - log.debug("Loader copied from kernel %s" % str(self['platform']['loader'])) + self['PV_kernel'] = '' else: self['platform']['loader'] = "/usr/lib/xen/boot/hvmloader" - log.debug("Loader %s" % str(self['platform']['loader'])) + log.debug("Loader is %s" % str(self['platform']['loader'])) # Compatibility hack, can go away soon. if 'soundhw' not in self['platform'] and \ diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 0519e32a26..4ceb36194f 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -455,7 +455,7 @@ class HVMImageHandler(ImageHandler): ret = ImageHandler.parseDeviceModelArgs(self, vmConfig) ret = ret + ['-vcpus', str(self.vm.getVCpuCount())] - if self.kernel and self.kernel != "/usr/lib/xen/boot/hvmloader": + if self.kernel: log.debug("kernel = %s", self.kernel) ret = ret + ['-kernel', self.kernel] if self.ramdisk: |