scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index b9061ecd8e..327c0dd3d6 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -88,7 +88,7 @@ fi
 
 if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
     QEMU=qemu-system-arm
-    if [ "$TYPE" = "ext2" ]; then
+    if [ "$TYPE" = "ext3" ]; then
         KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
         QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot"
     fi
@@ -113,9 +113,9 @@ fi
 
 if [ "$MACHINE" = "qemux86" ]; then
     QEMU=qemu
-    if [ "$TYPE" = "ext2" ]; then
+    if [ "$TYPE" = "ext3" ]; then
         KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
-        QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
+        QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
     fi
     if [ "$TYPE" = "nfs" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
             return
         fi
         KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
+        QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
     fi
 fi