From dd8d11c33b4eed596883ca31494a8efa63688d4a Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 28 Apr 2006 14:09:35 +0100 Subject: [PATCH] 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 --- tools/python/xen/xend/XendBootloader.py | 10 ++-------- tools/python/xen/xend/XendDomainInfo.py | 3 +-- tools/python/xen/xm/create.py | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py index 82d09b8bb9..7f348ddad1 100644 --- a/tools/python/xen/xend/XendBootloader.py +++ b/tools/python/xen/xend/XendBootloader.py @@ -19,13 +19,12 @@ import sxp 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, vcpus = None, entry = None): 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 --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 222b0c3c5c..59283e9737 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -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 --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 2e757848cd..37589f855d 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -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. -- 2.39.5