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 <katzj@redhat.com>

diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py
index 82d09b8bb92ddea0fbc75396f443a2a1517d7b64..7f348ddad1ee9ef0714144034214f04ad2ea3918 100644 (file)
--- 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 222b0c3c5c5069160f2325ce96bb0682a852a6ba..59283e97377d4b58fc6a7efcf6eca9f0ef19356d 100644 (file)
--- 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 2e757848cdf6face3013d437d30882fab4710c4c..37589f855d135d2216d14c3965e11faa0bc49d04 100644 (file)
--- 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.