From: Jeremy Katz Subject: [PATCH] Don't deal with vcpus in bootloader Date: Tue, 25 Apr 2006 22:43:21 -0400 Message-ID: <1146019401.3007.32.camel@aglarond.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-GPHTcuPfvTeIRN5ZDjNs" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=-GPHTcuPfvTeIRN5ZDjNs Content-Type: text/plain Content-Transfer-Encoding: 7bit The bootloader code doesn't actually have to deal with the vcpu config anymore as that's just in the domaininfo. So stop doing so. Signed-off-by: Jeremy Katz --=-GPHTcuPfvTeIRN5ZDjNs Content-Disposition: attachment; filename=xen-bootloader-no-vcpu.patch Content-Type: text/x-patch; name=xen-bootloader-no-vcpu.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit # HG changeset patch # User "Jeremy Katz " # Node ID 082ece02e135a31f75c5e5240abfc857977373b8 # Parent a3d695265fc8b4818e0acdfefaa3aa331566deb4 vcpus aren't part of the image anymore, so stop doing gymnastics to pass them around for the bootloader stuff diff -r a3d695265fc8 -r 082ece02e135 tools/python/xen/xend/XendBootloader.py --- a/tools/python/xen/xend/XendBootloader.py Tue Apr 25 21:16:15 2006 -0400 +++ b/tools/python/xen/xend/XendBootloader.py Tue Apr 25 21:17:18 2006 -0400 @@ -19,13 +19,12 @@ from XendLogging import log from XendLogging import log from XendError import VmError -def bootloader(blexec, disk, quiet = 0, vcpus = None, entry = None): +def bootloader(blexec, disk, quiet = 0, entry = None): """Run the boot loader executable on the given disk and return a config image. @param blexec Binary to use as the boot loader @param disk Disk to run the boot loader on. @param quiet Run in non-interactive mode, just booting the default. - @param vcpus Number of vcpus for the domain. @param entry Default entry to boot.""" if not os.access(blexec, os.X_OK): @@ -87,9 +86,4 @@ def bootloader(blexec, disk, quiet = 0, pin = sxp.Parser() pin.input(ret) pin.input_eof() - - config_image = pin.val - if vcpus and sxp.child_value(config_image, "vcpus") is None: - config_image.append(['vcpus', vcpus]) - - return config_image + return pin.val diff -r a3d695265fc8 -r 082ece02e135 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Tue Apr 25 21:16:15 2006 -0400 +++ b/tools/python/xen/xend/XendDomainInfo.py Tue Apr 25 21:17:18 2006 -0400 @@ -1619,8 +1619,7 @@ class XendDomainInfo: if disk is None: continue fn = blkdev_uname_to_file(sxp.child_value(disk, "uname")) - blcfg = bootloader(self.info['bootloader'], fn, 1, - self.info['vcpus']) + blcfg = bootloader(self.info['bootloader'], fn, 1) if blcfg is None: msg = "Had a bootloader specified, but can't find disk" log.error(msg) diff -r a3d695265fc8 -r 082ece02e135 tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Tue Apr 25 21:16:15 2006 -0400 +++ b/tools/python/xen/xm/create.py Tue Apr 25 21:17:18 2006 -0400 @@ -623,7 +623,7 @@ def run_bootloader(vals): file = blkif.blkdev_uname_to_file(uname) return bootloader(vals.bootloader, file, not vals.console_autoconnect, - vals.vcpus, vals.bootentry) + vals.bootentry) def make_config(vals): """Create the domain configuration. --=-GPHTcuPfvTeIRN5ZDjNs Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-GPHTcuPfvTeIRN5ZDjNs--