WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] The bootloader code doesn't actually have to deal with t

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] The bootloader code doesn't actually have to deal with the vcpu config
From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 28 Apr 2006 16:14:09 +0000
Delivery-date: Fri, 28 Apr 2006 09:15:31 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f06b6db6823d9667d368433a22946322a95a268b
# Parent  a8cac38001caea26608e7a67b9039bdec0a085d2
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@xxxxxxxxxx>

diff -r a8cac38001ca -r f06b6db6823d tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py   Fri Apr 28 14:08:40 2006 +0100
+++ b/tools/python/xen/xend/XendBootloader.py   Fri Apr 28 14:09:35 2006 +0100
@@ -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 a8cac38001ca -r f06b6db6823d tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Fri Apr 28 14:08:40 2006 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Fri Apr 28 14:09:35 2006 +0100
@@ -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 a8cac38001ca -r f06b6db6823d tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Fri Apr 28 14:08:40 2006 +0100
+++ b/tools/python/xen/xm/create.py     Fri Apr 28 14:09:35 2006 +0100
@@ -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.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] The bootloader code doesn't actually have to deal with the vcpu config, Xen patchbot -unstable <=