summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-09-19 07:06:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 10:10:19 (GMT)
commitab2b2a1f2a931258a80ea4e7ed9430aacac591b7 (patch)
tree085ce4f6e254acbfc2a079256e34ac0ea6b2a885 /scripts/runqemu-internal
parent32fdbd879c83dae7c23ee0f17d0035bbae832495 (diff)
downloadpoky-ab2b2a1f2a931258a80ea4e7ed9430aacac591b7.tar.gz
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 <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index a9b1c44..f2c8d83 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -221,7 +221,15 @@ n2=$(($n1 + 1))
221 221
222KERNEL_NETWORK_CMD="ip=192.168.7.$n2::192.168.7.$n1:255.255.255.0" 222KERNEL_NETWORK_CMD="ip=192.168.7.$n2::192.168.7.$n1:255.255.255.0"
223QEMU_TAP_CMD="-net tap,vlan=0,ifname=$TAP,script=no,downscript=no" 223QEMU_TAP_CMD="-net tap,vlan=0,ifname=$TAP,script=no,downscript=no"
224QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD" 224if [ "$KVM_ACTIVE" = "yes" ]; then
225 QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD,vhost=on"
226 DROOT="/dev/vda"
227 ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio"
228else
229 QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
230 DROOT="/dev/hda"
231 ROOTFS_OPTIONS="-hda $ROOTFS"
232fi
225KERNCMDLINE="mem=$QEMU_MEMORY" 233KERNCMDLINE="mem=$QEMU_MEMORY"
226QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet" 234QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
227 235
@@ -321,8 +329,8 @@ if [ "$MACHINE" = "qemux86" ]; then
321 QEMU=qemu-system-i386 329 QEMU=qemu-system-i386
322 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" 330 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
323 if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 331 if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
324 KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 332 KERNCMDLINE="vga=0 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
325 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" 333 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
326 fi 334 fi
327 if [ "$FSTYPE" = "nfs" ]; then 335 if [ "$FSTYPE" = "nfs" ]; then
328 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 336 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then