Add initial VMX support to xm-test:

1) Added script create_disk_image to make full virt image
2) Changed XenDomain.py to build separate XmTestDomain object
   for vmx guests (this structure will need to be cleaned up)
3) Changed ramdisk Makefile.am to create disk.img if vmx configured

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>

2 files changed, 328 insertions, 0 deletions

diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index d83aee56ca..75811dce78 100644
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -9,10 +9,16 @@ BR_IMG = $(BR_SRC)/rootfs.i386.ext2
 
 BR_ROOT = build_i386/root
 
+VMX_SCRIPT = bin/create_disk_image
+
 XMTEST_MAJ_VER = $(shell echo @PACKAGE_VERSION@ | perl -pe 's/(\d+)\.(\d+)\.\d+/\1.\2/')
 XMTEST_VER_IMG = initrd-$(XMTEST_MAJ_VER).img
 
+if VMX
+all: initrd.img disk.img
+else
 all: initrd.img
+endif
 
 $(BR_TAR):
 	wget $(BR_URL)
@@ -37,6 +43,10 @@ $(XMTEST_VER_IMG): $(BR_IMG)
 initrd.img: $(XMTEST_VER_IMG)
 	ln -sf $(XMTEST_VER_IMG) initrd.img
 
+disk.img: $(XMTEST_VER_IMG)
+	chmod a+x $(VMX_SCRIPT)
+	$(VMX_SCRIPT) -r $(XMTEST_VER_IMG) -i disk.img
+
 existing:
 	@[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \
 	echo Error, $(XMTEST_VER_IMG) not found
@@ -49,3 +59,4 @@ am_config_clean-local:
 	rm -f initrd.img
 	rm -f $(BR_TAR)
 	rm -Rf patches make.d
+	rm -f disk.img
diff --git a/tools/xm-test/ramdisk/bin/create_disk_image b/tools/xm-test/ramdisk/bin/create_disk_image
new file mode 100644
index 0000000000..0d6ba67791
--- /dev/null
+++ b/tools/xm-test/ramdisk/bin/create_disk_image
@@ -0,0 +1,317 @@
+#!/bin/bash
+###############################################################################
+##
+##  Copyright (C) International Business Machines  Corp., 2005
+##  Author(s):  Daniel Stekloff <dsteklof@us.ibm.com>
+##
+##  This program is free software; you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation; under version 2 of the License.
+##
+##  This program is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with this program; if not, write to the Free Software
+##  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##
+###############################################################################
+function cleanup()
+{
+	if [ "$LOOPD" ]; then
+		losetup -d $LOOPD
+	fi
+	if [ "$LOOPP" ]; then
+		losetup -d $LOOPP
+	fi
+	if  [ -e "$IMAGE" ]; then
+		rm -f "$IMAGE"
+	fi
+	if  [ -e "$LCONF" ]; then
+		rm -f "$LCONF"
+	fi
+}
+
+function die()
+{
+	cleanup
+	echo "$@"
+	exit 1
+}
+
+function usage()
+{
+	cat << EOU
+Command creates a vmx guest disk image for xm-test. 
+
+Usage: $0 [OPTIONS]
+
+OPTIONS:
+    -i|--image <name>        Image name to create.
+    -k|--kernel <name>       Kernel name to use for disk image.
+    -r|--rootfs <image>      Rootfs image to use for disk image.
+
+EOU
+}
+
+function check_dependencies()
+{
+	which lilo > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		die "$PROGNAME requires lilo version 22.7+ to be installed."
+	fi
+	local pass="$( lilo -V | cut -f3 -d " " | awk -F "." '
+		{
+			if ($1 >= 22 && $2 >= 7)
+				print "true"
+			else
+				print "false"
+		}')"
+	if [ $pass = "false" ]; then
+		die "$PROGNAME requires lilo version 22.7+ to be installed."
+	fi
+}
+
+function initialize_globals()
+{
+	PROGNAME="create_disk_image"
+	IMAGE="hvm.img"
+	KERNEL=""
+	LCONF="lilo.conf"
+	LOOPD=""    # Loop device for entire disk image
+	LOOPP=""    # Loop device for ext partition
+	ROOTFS=""
+	MNT="/tmp/$PROGNAME-mnt"
+	SIZE=8192
+	SECTORS=32
+	HEADS=8
+	CYLINDERS=$(($SIZE/$SECTORS/$HEADS*2))
+	BSIZE=$(($SIZE-$SECTORS))
+	OFFSET=$(($SECTORS*512))
+}
+
+function get_options()
+{
+	while [ $# -gt 0 ]; do
+		case $1 in
+			-i|--image)
+				shift
+				IMAGE=${1}
+				shift
+				;;
+			-k|--kernel)
+				shift
+				KERNEL=${1}
+				shift
+				;;
+			-r|--rootfs)
+				shift
+				ROOTFS=${1}
+				shift
+				;;
+			*)
+				usage
+				exit 1
+				;;
+		esac
+	done
+}
+
+function get_loopd()
+{
+	local loop
+
+	for i in `seq 0 7`; do
+		losetup /dev/loop$i > /dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			# found one
+			echo $i
+			return 0
+		fi
+	done
+	die "No free loopback devices."
+}
+
+function losetup_image()
+{
+	local loop=$1
+	shift
+
+	# If offset, then associate with it
+	if [ $# -eq 1 ]; then
+		losetup -o $1 $loop $IMAGE
+	else
+		losetup $loop $IMAGE
+	fi
+
+	if [ $? -ne 0 ]; then
+		die "Failed to losetup $IMAGE to $loop."
+	fi
+
+	echo "Associated $IMAGE with $loop"
+}
+
+function create_disk_image()
+{
+	dd bs=1024 count=$SIZE of=$IMAGE if=/dev/zero
+
+	fdisk -b 512 -C $CYLINDERS -H $HEADS -S $SECTORS "$IMAGE" > /dev/null 2>&1 << EOF
+n
+p
+1
+1
+
+a
+1
+w
+EOF
+}
+
+function makefs_image()
+{
+	mke2fs -N 24 -b 1024 $LOOPP $BSIZE
+
+	if [ $? -ne 0 ]; then
+		die "mke2fs $LOOPP failed."
+	fi
+}
+
+function dd_rootfs_to_image()
+{
+	if [ ! "$ROOTFS" ]; then
+		die "Must specify rootfs image to use."
+	fi
+
+	dd if="$ROOTFS" of="$LOOPP" > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		die "Failed to dd $ROOTFS to $LOOPP."
+	fi
+}
+
+function get_kernel()
+{
+	# look in /boot for an existing kernel
+	local -a kernels=( `ls /boot | grep vmlinuz` )
+	local k
+
+	for k in ${kernels[@]}; do
+		case "$k" in
+			*xen*)
+				continue
+				;;
+			*)
+				KERNEL="/boot/$k"
+				echo "Using kernel $KERNEL"
+				break
+				;;
+		esac
+	done
+}
+
+function copy_kernel_to_image()
+{
+	if [ ! "$KERNEL" ]; then
+		get_kernel || die "Couldn't find a kernel to use."
+	fi
+
+	mkdir "$MNT/boot"
+
+	cp "$KERNEL" "$MNT/boot"
+}
+
+function lilo_image()
+{
+	local kernel=`basename $KERNEL`
+
+	(
+	cat <<EOC
+boot=$LOOPD
+delay=10
+geometric
+map=$MNT/boot/map
+disk=$LOOPD
+        bios=0x80
+        sectors=$SECTORS
+        heads=$HEADS
+        cylinders=$CYLINDERS
+        partition=$LOOPP
+                start=$SECTORS
+image=$MNT/boot/$kernel
+	append="root=0301 console=tty0 console=ttyS0"
+#	append="root=0301"
+        label=Linux
+        read-only
+EOC
+	) > "/$MNT/boot/$LCONF"
+}
+
+function install_lilo()
+{
+	lilo -C "$MNT/boot/$LCONF"
+	if [ $? -ne 0 ]; then
+		die "Failed to install $MNT/boot/$LCONF."
+	fi
+}
+
+function add_getty_to_inittab()
+{
+	local itab=$MNT/etc/inittab
+
+	if [ -e "$itab" ]; then
+		echo "# Start getty on serial line" >> $itab
+		echo "S0:12345:respawn:/sbin/getty ttyS0" >> $itab
+	fi
+}
+
+
+# Main starts here
+initialize_globals
+check_dependencies
+
+get_options "$@"
+
+create_disk_image
+
+# Get the first free loop device
+ldev=$(get_loopd)
+LOOPD="/dev/loop$ldev"
+losetup_image $LOOPD
+
+# Now associate where the partition will go
+ldev=$(get_loopd)
+LOOPP="/dev/loop$ldev"
+losetup_image $LOOPP $OFFSET
+
+makefs_image
+
+dd_rootfs_to_image
+
+if [ -e "$MNT" ]; then
+	rm -Rf "$MNT"
+fi
+
+mkdir "$MNT";
+if [ $? -ne 0 ]; then
+	die "Failed to create temporary mount point $MNT."
+fi
+
+mount "$LOOPP" "$MNT";
+if [ $? -ne 0 ]; then
+	die "Failed to mount $LOOPP on $MNT."
+fi
+
+copy_kernel_to_image
+#add_getty_to_inittab
+
+lilo_image
+install_lilo
+
+umount "$MNT"
+rm -Rf "$MNT";
+
+losetup -d $LOOPD
+losetup -d $LOOPP
+
+exit 0