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

[xen.git] / scripts-server

diff --git a/scripts-server b/scripts-server
index d665280a08331a3728a986584385e702893ff952..fe844e747b3149cc8260a0852fd01079210fdc5a 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -9,13 +9,16 @@
 # is the version of Fedora to install
 
 vm_host = 0
-vm_mem  = 1
-vm_mac5 = 2
-machines = { 'bees-knees'   : ['not-forward',  4096, 10],
-             'cats-whiskers': ['not-forward',  7168, 20],
-             'not-backward' : ['not-forward',  2048, 30],
-             'busy-beaver'  : ['conan-obrien', 3072, 40],
-             'pancake-bunny': ['conan-obrien', 3072, 50],
+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]
 
@@ -26,6 +29,7 @@ if 'install' in locals():
   # pub/fedora/linux/releases/test/11-Preview/Fedora/x86_64/os/isolinux/
   kernel = "/root/%s-install/vmlinuz" % install
   ramdisk = "/root/%s-install/initrd.img" % install
+  extra = "selinux=0"
 elif 'type' in locals() and type == 'hvm':
   kernel = "/usr/lib/xen/boot/hvmloader"
   builder = "hvm"
@@ -35,7 +39,7 @@ else:
   # 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
@@ -45,7 +49,7 @@ disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',
 vif = [i % mac5 for i in ['bridge=eth0, mac=ac:de:48:00:%s:01',
                           'bridge=eth1, mac=ac:de:48:00:%s:02']]
 
-if builder != "hvm":
+if 'builder' not in locals() or builder != "hvm":
   # https://bugzilla.redhat.com/show_bug.cgi?id=466681
   # pygrub uses cached and eventually outdated grub.conf, kernel and initrd
   file('/proc/sys/vm/drop_caches', 'w').write('1')