diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-01-28 19:16:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 17:56:00 +0000 |
| commit | e6ade33a6f52434e884dd97549b8ac731347d9ad (patch) | |
| tree | 00554467bb53d91b85d597e31151d2ee5363c90d /scripts/runqemu-internal | |
| parent | fd0e9ad4d295ca11b33c3e3e11069421dee834e8 (diff) | |
| download | openembedded-core-e6ade33a6f52434e884dd97549b8ac731347d9ad.tar.gz openembedded-core-e6ade33a6f52434e884dd97549b8ac731347d9ad.tar.bz2 openembedded-core-e6ade33a6f52434e884dd97549b8ac731347d9ad.zip | |
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.
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-x | scripts/runqemu-internal | 7 |
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 if [ "$MACHINE" = "qemux86-64" ]; then QEMU=qemu-system-x86_64 + CPU_SUBTYPE=core2duo if [ ! -z "$vga_option" ]; then QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" else @@ -395,7 +396,7 @@ if [ "$MACHINE" = "qemux86-64" ]; then fi if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" - QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then if [ "x$ROOTFS" = "x" ]; then @@ -407,10 +408,10 @@ if [ "$MACHINE" = "qemux86-64" ]; then return 1 fi KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "vmdk" ]; then - QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS" fi # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in # qemux86 and qemux86-64. We can use timer interrupt mode for now. |