diff -r 5f997b5b8a58 tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Wed Jan 30 15:19:22 2008 +0000 +++ b/tools/python/xen/xend/XendConfig.py Thu Jan 31 12:50:30 2008 -0500 @@ -124,7 +124,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict( LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG) # Platform configuration keys. -XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', +XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'loader', 'display', 'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor', 'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl', 'soundhw','stdvga', 'usb', 'usbdevice', 'vnc', @@ -404,6 +404,17 @@ class XendConfig(dict): self['platform']['device_model'] = xen.util.auxbin.pathTo("qemu-dm") 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": + self['platform']['loader'] = self['PV_kernel'] + log.debug("Loader copied from kernel %s" % str(self['platform']['loader'])) + else: + self['platform']['loader'] = "/usr/lib/xen/boot/hvmloader" + log.debug("Loader %s" % str(self['platform']['loader'])) + # Compatibility hack, can go away soon. if 'soundhw' not in self['platform'] and \ self['platform'].get('enable_audio'): diff -r 5f997b5b8a58 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Wed Jan 30 15:19:22 2008 +0000 +++ b/tools/python/xen/xend/image.py Thu Jan 31 12:50:30 2008 -0500 @@ -127,7 +127,7 @@ class ImageHandler: """ # Set params and call buildDomain(). - if not os.path.isfile(self.kernel): + if self.kernel and not os.path.isfile(self.kernel): raise VmError('Kernel image does not exist: %s' % self.kernel) if self.ramdisk and not os.path.isfile(self.ramdisk): raise VmError('Kernel ramdisk does not exist: %s' % self.ramdisk) @@ -186,6 +186,10 @@ class ImageHandler: # xm config file def parseDeviceModelArgs(self, vmConfig): ret = ["-domain-name", str(self.vm.info['name_label'])] + + # Tell QEMU how large the guest's memory allocation is + # to help it when loading the initrd (if neccessary) + ret += ["-m", str(self.getRequiredInitialReservation() / 1024)] # Find RFB console device, and if it exists, make QEMU enable # the VNC console. @@ -420,8 +424,7 @@ class HVMImageHandler(ImageHandler): def configure(self, vmConfig): ImageHandler.configure(self, vmConfig) - if not self.kernel: - self.kernel = '/usr/lib/xen/boot/hvmloader' + self.loader = vmConfig['platform'].get('loader') info = xc.xeninfo() if 'hvm' not in info['xen_caps']: @@ -445,6 +448,17 @@ class HVMImageHandler(ImageHandler): def parseDeviceModelArgs(self, vmConfig): ret = ImageHandler.parseDeviceModelArgs(self, vmConfig) ret = ret + ['-vcpus', str(self.vm.getVCpuCount())] + + if self.kernel and self.kernel != "/usr/lib/xen/boot/hvmloader": + log.debug("kernel = %s", self.kernel) + ret = ret + ['-kernel', self.kernel] + if self.ramdisk: + log.debug("ramdisk = %s", self.ramdisk) + ret = ret + ['-initrd', self.ramdisk] + if self.cmdline: + log.debug("cmdline = %s", self.cmdline) + ret = ret + ['-append', self.cmdline] + dmargs = [ 'boot', 'fda', 'fdb', 'soundhw', 'localtime', 'serial', 'stdvga', 'isa', @@ -521,7 +535,7 @@ class HVMImageHandler(ImageHandler): mem_mb = self.getRequiredInitialReservation() / 1024 log.debug("domid = %d", self.vm.getDomid()) - log.debug("image = %s", self.kernel) + log.debug("image = %s", self.loader) log.debug("store_evtchn = %d", store_evtchn) log.debug("memsize = %d", mem_mb) log.debug("vcpus = %d", self.vm.getVCpuCount()) @@ -529,7 +543,7 @@ class HVMImageHandler(ImageHandler): log.debug("apic = %d", self.apic) rc = xc.hvm_build(domid = self.vm.getDomid(), - image = self.kernel, + image = self.loader, memsize = mem_mb, vcpus = self.vm.getVCpuCount(), acpi = self.acpi, diff -r 5f997b5b8a58 tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Wed Jan 30 15:19:22 2008 +0000 +++ b/tools/python/xen/xm/create.py Thu Jan 31 12:50:30 2008 -0500 @@ -158,6 +158,10 @@ gopts.var('ramdisk', val='FILE', fn=set_value, default='', use="Path to ramdisk.") +gopts.var('loader', val='FILE', + fn=set_value, default='', + use="Path to HVM firmware.") + gopts.var('features', val='FEATURES', fn=set_value, default='', use="Features to enable in guest kernel") @@ -561,6 +565,8 @@ def configure_image(vals): config_image.append([ 'kernel', os.path.abspath(vals.kernel) ]) if vals.ramdisk: config_image.append([ 'ramdisk', os.path.abspath(vals.ramdisk) ]) + if vals.loader: + config_image.append([ 'loader', os.path.abspath(vals.loader) ]) if vals.cmdline_ip: cmdline_ip = strip('ip=', vals.cmdline_ip) config_image.append(['ip', cmdline_ip])