From ab2b2a1f2a931258a80ea4e7ed9430aacac591b7 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 19 Sep 2012 10:06:54 +0300 Subject: qemux86: Support for KVM, paravirt and virtio added KVM, paravirtualization and virtio drivers are now activated in runqemu using the kvm option flag for qemux86. Host CPU features are also exported to guest OS (Yocto Linux). Usage example: runqemu qemux86 core-image-x11 kvm Implements [YOCTO #2550]. (From OE-Core rev: a35d03e2eb905de4eadc9c7df5b50bff1fb7f897) Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/runqemu-internal | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'scripts/runqemu-internal') diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index a9b1c44de4..f2c8d8309f 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -221,7 +221,15 @@ n2=$(($n1 + 1)) KERNEL_NETWORK_CMD="ip=192.168.7.$n2::192.168.7.$n1:255.255.255.0" QEMU_TAP_CMD="-net tap,vlan=0,ifname=$TAP,script=no,downscript=no" -QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" +if [ "$KVM_ACTIVE" = "yes" ]; then + QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD,vhost=on" + DROOT="/dev/vda" + ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio" +else + QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" + DROOT="/dev/hda" + ROOTFS_OPTIONS="-hda $ROOTFS" +fi KERNCMDLINE="mem=$QEMU_MEMORY" QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet" @@ -321,8 +329,8 @@ if [ "$MACHINE" = "qemux86" ]; then QEMU=qemu-system-i386 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then - KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" - QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" + KERNCMDLINE="vga=0 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" + QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then -- cgit v1.2.3-54-g00ecf