Make vcpus variable per-VM, so that AMD guests that can't live

as SMP machines work.

diff --git a/scripts-server b/scripts-server
index fd6d04a9c0e724956f8ae5c41e3bce51a9bf3029..fe844e747b3149cc8260a0852fd01079210fdc5a 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -9,15 +9,16 @@
 # is the version of Fedora to install
 
 vm_host = 0
 # is the version of Fedora to install
 
 vm_host = 0

-vm_mem  = 1
-vm_mac5 = 2
-machines = { 'bees-knees'     : ['david-letterman',  6144, 10],
-             'cats-whiskers'  : ['david-letterman',  6144, 20],
-             'not-backward'   : ['david-letterman',  2048, 30],
-             'busy-beaver'    : ['conan-obrien',     3072, 40],
-             'pancake-bunny'  : ['conan-obrien',     3072, 50],
-             'whole-enchilada': ['conan-obrien',     3072, 60],
-             'real-mccoy'     : ['jay-leno',         5120, 70],
+vm_cpus = 1
+vm_mem  = 2
+vm_mac5 = 3
+machines = { 'bees-knees'     : ['david-letterman',  2, 6144, 10],
+             'cats-whiskers'  : ['david-letterman',  2, 6144, 20],
+             'not-backward'   : ['david-letterman',  2, 2048, 30],
+             'busy-beaver'    : ['conan-obrien',     1, 3072, 40],
+             'pancake-bunny'  : ['conan-obrien',     1, 3072, 50],
+             'whole-enchilada': ['conan-obrien',     1, 3072, 60],
+             'real-mccoy'     : ['jay-leno',         1, 5120, 70],

            }
 vm = machines[machine_name]
 
            }
 vm = machines[machine_name]
 


@@ -38,7 +39,7 @@ else:
   # Fedora installs GRUB.
   bootloader = "/usr/bin/pygrub"
 
   # Fedora installs GRUB.
   bootloader = "/usr/bin/pygrub"
 

-vcpus = 2
+vcpus = vm[vm_cpus]

 if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name
 if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name