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 a56c0732423bc409ee5e9ae536702886317a06df..fe844e747b3149cc8260a0852fd01079210fdc5a 100644 (file)
--- a/scripts-server
+++ b/scripts-server
@@ -1,22 +1,35 @@
 # Xen domain configuration file for scripts.mit.edu virtualized web servers
 #
 # usage, e.g.:
-#   xm create scripts-server machine_name=bees-knees mac5=10
-#   xm create scripts-server machine_name=cats-whiskers mac5=20
+#   xm create scripts-server machine_name=bees-knees
+#   xm create scripts-server machine_name=cats-whiskers
 # name is the name of the server (as used in the LV volumes)
 # mac5 is the fifth octet of the MAC address: ac:de:48:00:xx:01
-# set install=fcX if you want to run a Fedora install
+# set install=fcX if you want to run a Fedora install, where X
+# is the version of Fedora to install
 
-macs = { 'bees-knees'   : 10,
-         'cats-whiskers': 20
-       }
-mac5 = macs[machine_name]
+vm_host = 0
+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]
+
+mac5 = vm[vm_mac5]
 
 if 'install' in locals():
   # Get these files from a Fedora mirror, from a path like
   # 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"
@@ -26,12 +39,17 @@ else:
   # Fedora installs GRUB.
   bootloader = "/usr/bin/pygrub"
 
-vcpus = 2
-memory = 4096
+vcpus = vm[vm_cpus]
+if 'memory' not in locals(): memory = vm[vm_mem]
 maxmem = 16384
 name = machine_name
-vg = "not-forward"
+vg = vm[vm_host]
 disk = [i % (vg, name) for i in ['phy:/dev/%s/%s-root,hda,w',
                                  'phy:/dev/%s/%s-swap,hdb,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' 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')