From: nitin.a.kamble@intel.com
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/5] runqemu: support qemux32 machine
Date: Tue, 12 Jul 2011 12:02:39 -0700 [thread overview]
Message-ID: <177b3514fcb50027a166e78ed88bf94f08fef8a4.1310497097.git.nitin.a.kamble@intel.com> (raw)
In-Reply-To: <af851424130d145cef560c4bfaf2ba88ea4c3da6.1310497097.git.nitin.a.kamble@intel.com>
In-Reply-To: <cover.1310497097.git.nitin.a.kamble@intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
scripts/qemuimage-testlib | 2 +-
scripts/runqemu | 12 ++++++++----
scripts/runqemu-internal | 25 +++++++++++++++++++++++++
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index c2dbf60..05df11a 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -424,7 +424,7 @@ Test_Create_Qemu()
return 1
fi
- if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux86-64" ]; then
+ if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux32" -o "$QEMUARCH" = "qemux86-64" ]; then
KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH})
elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" -o "$QEMUARCH" = "qemuppc" ]; then
KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k zImage -a ${QEMUARCH})
diff --git a/scripts/runqemu b/scripts/runqemu
index 5aed25a..ef57638 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -93,7 +93,7 @@ i=1
while [ $i -le $# ]; do
arg=${!i}
case $arg in
- "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc")
+ "qemux86" | "qemux32" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc")
if [ -z "$MACHINE" ]; then
MACHINE=$arg
else
@@ -136,7 +136,7 @@ while [ $i -le $# ]; do
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
;;
"audio")
- if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux86-64" ]]; then
+ if [[ "x$MACHINE" == "xqemux86" || "x$MACHINE" == "xqemux32" || "x$MACHINE" == "xqemux86-64" ]]; then
echo "Enable audio on qemu. Pls. install snd_intel8x0 or snd_ens1370 driver in linux guest.";
QEMU_AUDIO_DRV="alsa"
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -soundhw ac97,es1370"
@@ -192,7 +192,7 @@ if [[ "x$KVM_ENABLED" == "xyes" ]]; then
echo "$YOCTO_KVM_WIKI";
exit 1;
fi
- if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux86-64" ]]; then
+ if [[ "x$MACHINE" != "xqemux86" && "x$MACHINE" != "xqemux32" && "x$MACHINE" != "xqemux86-64" ]]; then
echo "KVM only support x86 & x86-64. Remove kvm from the command-line";
exit 1;
fi
@@ -221,7 +221,7 @@ if [[ "$FSTYPE" == "nfs" && -z "$ROOTFS" ]]; then
fi
if [ -z "$MACHINE" ]; then
- MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'`
+ MACHINE=`basename $KERNEL | sed 's/.*-\(qemux86-64\|qemux32\|qemux86\|qemuarm\|qemumips\|qemuppc\).*/\1/'`
if [ -z "$MACHINE" ]; then
echo "Error: Unable to set MACHINE from kernel filename [$KERNEL]"
usage
@@ -236,6 +236,10 @@ QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
QEMUX86_DEFAULT_FSTYPE=ext3
QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
+QEMUX32_DEFAULT_KERNEL=bzImage-qemux32.bin
+QEMUX32_DEFAULT_FSTYPE=ext3
+QEMUX32_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
+
QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
QEMUX86_64_DEFAULT_FSTYPE=ext3
QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c15632d..9f204e0 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -45,6 +45,9 @@ else
"qemux86")
mem_size=128
;;
+ "qemux32")
+ mem_size=128
+ ;;
"qemux86-64")
mem_size=128
;;
@@ -218,6 +221,7 @@ case "$MACHINE" in
"qemuarmv6") ;;
"qemuarmv7") ;;
"qemux86") ;;
+ "qemux32") ;;
"qemux86-64") ;;
"akita") ;;
"spitz") ;;
@@ -319,6 +323,27 @@ if [ "$MACHINE" = "qemux86" ]; then
KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
fi
+if [ "$MACHINE" = "qemux32" ]; then
+ QEMU=qemu-system-x86_64
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
+ if [ "$FSTYPE" = "ext3" ]; then
+ KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS"
+ fi
+ if [ "$FSTYPE" = "nfs" ]; then
+ if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
+ echo "Error: NFS mount point $ROOTFS doesn't exist."
+ cleanup
+ return
+ 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"
+ 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.
+ KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
+fi
+
if [ "$MACHINE" = "qemux86-64" ]; then
QEMU=qemu-system-x86_64
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
--
1.7.5.4
next prev parent reply other threads:[~2011-07-13 1:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 19:02 [PATCH 0/5] commits for yocto.git tree for x32 work nitin.a.kamble
2011-07-12 19:02 ` [PATCH 1/5] siteinfo.bbclass: hack for x32 nitin.a.kamble
2011-07-13 6:20 ` Khem Raj
2011-07-13 15:41 ` Kamble, Nitin A
2011-07-14 19:49 ` Khem Raj
2011-07-12 19:02 ` [PATCH 2/5] udev-172: add a newer version for newer kernel nitin.a.kamble
2011-07-13 6:22 ` Khem Raj
2011-07-13 6:59 ` Koen Kooi
2011-07-13 15:43 ` Kamble, Nitin A
2011-07-12 19:02 ` nitin.a.kamble [this message]
2011-07-13 1:35 ` [PATCH 3/5] runqemu: support qemux32 machine Bruce Ashfield
2011-07-12 19:02 ` [PATCH 4/5] kernel.bbclass: fix the broken lines nitin.a.kamble
2011-07-13 11:16 ` Richard Purdie
2011-07-12 19:02 ` [PATCH 5/5] glibc: fix false failure nitin.a.kamble
2011-07-13 11:16 ` Richard Purdie
2011-07-13 11:20 ` [PATCH 0/5] commits for yocto.git tree for x32 work Richard Purdie
2011-07-13 14:14 ` Tom Rini
2011-07-13 14:38 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=177b3514fcb50027a166e78ed88bf94f08fef8a4.1310497097.git.nitin.a.kamble@intel.com \
--to=nitin.a.kamble@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.