From 77647df304e9c939d621e4f32423a1b50991b676 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 23 Feb 2011 11:02:58 +0530 Subject: run-test: Switch to using virtio-blk for the h/d Use virtio-blk with the -drive and -device virtio-blk-pci arguments instead of the default ide device. Also use cache=unsafe for the drive as we don't care about consistency. Signed-off-by: Amit Shah --- run-test.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/run-test.sh b/run-test.sh index c6aa949..3adbf1e 100755 --- a/run-test.sh +++ b/run-test.sh @@ -14,7 +14,7 @@ GUEST=${GUEST:-$GUEST_DEF} KERNEL="-kernel $KERNEL" #KERNELARG="-append \"root=/dev/sda2 console=tty0 console=ttyS0\"" -KERNELARG="-append root=/dev/sda2" +KERNELARG="-append root=/dev/vda2" CHARDEVS="-chardev socket,path=/tmp/amit/test0,server,nowait,id=test0 \ -chardev socket,path=/tmp/amit/test1,server,nowait,id=test1 \ @@ -32,6 +32,8 @@ MISCOPT="-net none -enable-kvm -m 1G -serial file:/tmp/amit/test-serial.log \ -monitor unix:/tmp/amit/test-monitor,server,nowait" KVMOPT="-smp $VCPUS" SNAPSHOT="-snapshot" +DRIVE="-drive file=$GUEST,if=none,id=guest,cache=unsafe \ + -device virtio-blk-pci,drive=guest" QEMU_PIDFILE=/tmp/amit/qemu.pid @@ -76,14 +78,14 @@ function do_test { } # -- Iteration 1: new kernel, new qemu -- -QEMU_OPTS="$GUEST $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT \ +QEMU_OPTS="$DRIVE $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT \ $SNAPSHOT $KVMOPT" do_test # -- Iteration 2: old kernel, new qemu -- -QEMU_OPTS="$GUEST $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT $KVMOPT" +QEMU_OPTS="$DRIVE $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT $KVMOPT" do_test @@ -92,6 +94,6 @@ do_test CHARDEVS= VIRTSER="-virtioconsole unix:/tmp/amit/test0,server,nowait" -QEMU_OPTS="$GUEST $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT" +QEMU_OPTS="$DRIVE $KERNEL $KERNELARG $CHARDEVS $VIRTSER $VNC $MISCOPT $SNAPSHOT" do_test -- cgit