diff options
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 | |||
388 | 388 | ||
389 | if [ "$MACHINE" = "qemux86-64" ]; then | 389 | if [ "$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. |