diff options
| author | Cristian Iorga <cristian.iorga@intel.com> | 2014-02-13 17:26:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 17:48:47 +0000 |
| commit | 0e5cfef90ff762b33da6dc301dfc9cb3947c8a02 (patch) | |
| tree | c5f548155555d5ae7663f5621e68c5a10840ef00 /scripts/runqemu-internal | |
| parent | c3dd44b751e351be52512e2aff885bf571c95fe5 (diff) | |
| download | openembedded-core-0e5cfef90ff762b33da6dc301dfc9cb3947c8a02.tar.gz openembedded-core-0e5cfef90ff762b33da6dc301dfc9cb3947c8a02.tar.bz2 openembedded-core-0e5cfef90ff762b33da6dc301dfc9cb3947c8a02.zip | |
runqemu: enforce right CPU type for qemux86/x86-64
Set in accordance with qemu machines configs.
Fixes [YOCTO #5817].
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
| -rwxr-xr-x | scripts/runqemu-internal | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 08931074ec..f9ca380f26 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -360,6 +360,11 @@ fi if [ "$MACHINE" = "qemux86" ]; then QEMU=qemu-system-i386 + if [ "$KVM_ACTIVE" = "yes" ]; then + CPU_SUBTYPE=kvm32 + else + CPU_SUBTYPE=qemu32 + fi if [ ! -z "$vga_option" ]; then QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" else @@ -367,7 +372,7 @@ if [ "$MACHINE" = "qemux86" ]; 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 [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then @@ -388,7 +393,11 @@ fi if [ "$MACHINE" = "qemux86-64" ]; then QEMU=qemu-system-x86_64 - CPU_SUBTYPE=core2duo + if [ "$KVM_ACTIVE" = "yes" ]; then + CPU_SUBTYPE=kvm64 + else + CPU_SUBTYPE=core2duo + fi if [ ! -z "$vga_option" ]; then QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" else |