diff options
| -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. |