summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-01-28 19:16:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 18:01:47 +0000
commit9532004b527fdf3a819b8b0e7e64833003a4b1d4 (patch)
treeca933e1d46a660fc9053303d46fdc4047bc21b2f /scripts/runqemu-internal
parent82893ffced1f95981ad9bdeec31251ff6ec96529 (diff)
downloadpoky-9532004b527fdf3a819b8b0e7e64833003a4b1d4.tar.gz
scripts/runqemu-internal: use -cpu core2duo for qemux86-64
Now that the tune for qemux86-64 changed to core2-64 we need to tell the emulator to use a proper CPU model. With the default setting of qemu64 we'll get things like: root@qemux86-64:~# smart --help traps: python[758] trap invalid opcode ip:7f2af01f6be7 sp:7fff49466ef0 error:0 in strop.so[7f2af01f5000+6000] Illegal instruction If the tune for qemux86 changes, that needs to be updated too. (From OE-Core rev: e6ade33a6f52434e884dd97549b8ac731347d9ad) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index e3b0729030..08931074ec 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -388,6 +388,7 @@ fi
388 388
389if [ "$MACHINE" = "qemux86-64" ]; then 389if [ "$MACHINE" = "qemux86-64" ]; then
390 QEMU=qemu-system-x86_64 390 QEMU=qemu-system-x86_64
391 CPU_SUBTYPE=core2duo
391 if [ ! -z "$vga_option" ]; then 392 if [ ! -z "$vga_option" ]; then
392 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 393 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
393 else 394 else
@@ -395,7 +396,7 @@ if [ "$MACHINE" = "qemux86-64" ]; then
395 fi 396 fi
396 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 397 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
397 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 398 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
398 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 399 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
399 fi 400 fi
400 if [ "$FSTYPE" = "nfs" ]; then 401 if [ "$FSTYPE" = "nfs" ]; then
401 if [ "x$ROOTFS" = "x" ]; then 402 if [ "x$ROOTFS" = "x" ]; then
@@ -407,10 +408,10 @@ if [ "$MACHINE" = "qemux86-64" ]; then
407 return 1 408 return 1
408 fi 409 fi
409 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 410 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
410 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" 411 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
411 fi 412 fi
412 if [ "$FSTYPE" = "vmdk" ]; then 413 if [ "$FSTYPE" = "vmdk" ]; then
413 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" 414 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
414 fi 415 fi
415 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in 416 # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in
416 # qemux86 and qemux86-64. We can use timer interrupt mode for now. 417 # qemux86 and qemux86-64. We can use timer interrupt mode for now.