[PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[Jagadeesh Krishnanjanappa]

Basically, runqemu script autodetects MACHINE type based on the
kernel image name; if MACHINE name is not specified. Since 'qemuarm'
string is common in both qemuarm amnd qemuarm64 kernel image names, the
MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel
image name is given in command line.

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
---
 scripts/runqemu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 84ece4d..09c507d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -232,13 +232,13 @@ fi
 
 if [ -z "$MACHINE" ]; then
     if [ "x$FSTYPE" = "xvmdk" ]; then
-        MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
+        MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
         if [ -z "$MACHINE" ]; then
             error "Unable to set MACHINE from vmdk filename [$VM]"
         fi
         echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
     else
-        MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
+        MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
         if [ -z "$MACHINE" ]; then
             error "Unable to set MACHINE from kernel filename [$KERNEL]"
         fi
-- 
1.9.1

[PATCH v2][fido 2/4] runqemu-script: define console for qemuarm NFS booting

[Jagadeesh Krishnanjanappa]

Add console=ttyAMA0,115200 as one of the boot parameters
for qemuarm, in order to print bootlog messages on the
console.

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
---
 scripts/runqemu-internal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2db5566..dc0e053 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -368,7 +368,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
             cleanup
             return 1
         fi
-        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
         QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot $QEMU_UI_OPTIONS"
     fi
     if [ "$MACHINE" = "qemuarmv6" ]; then
-- 
1.9.1

[PATCH v2][fido 3/4] runqemu-internal: add support to boot arm64 qemu target via NFS

[Jagadeesh Krishnanjanappa]

Add required boot parameters inorder to boot arm64 qemu
target via NFS

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
---
 scripts/runqemu-internal | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index dc0e053..fb51754 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -389,6 +389,15 @@ if [ "$MACHINE" = "qemuarm64" ]; then
         # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
         QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $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 1
+        fi
+        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
+        QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $QEMU_UI_OPTIONS"
+    fi
 fi
 
 
-- 
1.9.1

[PATCH v2][fido 4/4] runqemu-internal: set mutual exclusiveness for serial and nographic options

[Jagadeesh Krishnanjanappa]

Use "-nographic" option only if "serial" option is not
specified. Otherwise we get below error when
'runqemu <kernel_image> <rootfs_image> serial' is executed,

(snip)
QEMU 2.2.0 monitor - type 'help' for more information
(qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple
character devices
-- CUT --

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
---
 scripts/runqemu-internal | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index fb51754..e346c64 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -275,9 +275,6 @@ else
 
         KERNCMDLINE="mem=$QEMU_MEMORY"
         QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
-        if [ $MACHINE = 'qemuarm64' ]; then
-            QEMU_UI_OPTIONS="-nographic"
-        fi
 
         NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
         export NFS_INSTANCE
@@ -383,7 +380,11 @@ if [ "$MACHINE" = "qemuarm64" ]; then
     QEMU=qemu-system-aarch64
 
     export QEMU_AUDIO_DRV="none"
-    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+    if [ "x$SERIALSTDIO" = "x" ] ; then
+        QEMU_UI_OPTIONS="-nographic"
+    else
+        QEMU_UI_OPTIONS=""
+    fi
     if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
         KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
         # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
-- 
1.9.1

Re: [PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]

ping

Regards,
Jagadeesh

On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
jkrishnanjanappa@mvista.com> wrote:

> Basically, runqemu script autodetects MACHINE type based on the
> kernel image name; if MACHINE name is not specified. Since 'qemuarm'
> string is common in both qemuarm amnd qemuarm64 kernel image names, the
> MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel
> image name is given in command line.
>
> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
> ---
>  scripts/runqemu | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 84ece4d..09c507d 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -232,13 +232,13 @@ fi
>
>  if [ -z "$MACHINE" ]; then
>      if [ "x$FSTYPE" = "xvmdk" ]; then
> -        MACHINE=`basename $VM | sed -n
> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
> +        MACHINE=`basename $VM | sed -n
> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>          if [ -z "$MACHINE" ]; then
>              error "Unable to set MACHINE from vmdk filename [$VM]"
>          fi
>          echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
>      else
> -        MACHINE=`basename $KERNEL | sed -n
> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
> +        MACHINE=`basename $KERNEL | sed -n
> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>          if [ -z "$MACHINE" ]; then
>              error "Unable to set MACHINE from kernel filename [$KERNEL]"
>          fi
> --
> 1.9.1
>
>

[-- Attachment #2: Type: text/html, Size: 2466 bytes --]

Re: [PATCH v2][fido 2/4] runqemu-script: define console for qemuarm NFS booting

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

ping.

Regards,
Jagadeesh

On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
jkrishnanjanappa@mvista.com> wrote:

> Add console=ttyAMA0,115200 as one of the boot parameters
> for qemuarm, in order to print bootlog messages on the
> console.
>
> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
> ---
>  scripts/runqemu-internal | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
> index 2db5566..dc0e053 100755
> --- a/scripts/runqemu-internal
> +++ b/scripts/runqemu-internal
> @@ -368,7 +368,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" =
> "qemuarmv6" -o "$MACHINE" = "qemuarm
>              cleanup
>              return 1
>          fi
> -        KERNCMDLINE="root=/dev/nfs
> nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD
> mem=$QEMU_MEMORY"
> +        KERNCMDLINE="root=/dev/nfs
> nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200
> $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
>          QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot
> $QEMU_UI_OPTIONS"
>      fi
>      if [ "$MACHINE" = "qemuarmv6" ]; then
> --
> 1.9.1
>
>

[-- Attachment #2: Type: text/html, Size: 1854 bytes --]

Re: [PATCH v2][fido 3/4] runqemu-internal: add support to boot arm64 qemu target via NFS

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]

ping.

Regards,
Jagadeesh

On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
jkrishnanjanappa@mvista.com> wrote:

> Add required boot parameters inorder to boot arm64 qemu
> target via NFS
>
> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
> ---
>  scripts/runqemu-internal | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
> index dc0e053..fb51754 100755
> --- a/scripts/runqemu-internal
> +++ b/scripts/runqemu-internal
> @@ -389,6 +389,15 @@ if [ "$MACHINE" = "qemuarm64" ]; then
>          # qemu-system-aarch64 only support '-machine virt -cpu
> cortex-a57' for now
>          QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57
> $ROOTFS_OPTIONS $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 1
> +        fi
> +        KERNCMDLINE="root=/dev/nfs
> nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400
> mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
> +        QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57
> $QEMU_UI_OPTIONS"
> +    fi
>  fi
>
>
> --
> 1.9.1
>
>

[-- Attachment #2: Type: text/html, Size: 2037 bytes --]

Re: [PATCH v2][fido 4/4] runqemu-internal: set mutual exclusiveness for serial and nographic options

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 1788 bytes --]

ping.

Regards,
Jagadeesh

On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
jkrishnanjanappa@mvista.com> wrote:

> Use "-nographic" option only if "serial" option is not
> specified. Otherwise we get below error when
> 'runqemu <kernel_image> <rootfs_image> serial' is executed,
>
> (snip)
> QEMU 2.2.0 monitor - type 'help' for more information
> (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple
> character devices
> -- CUT --
>
> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
> ---
>  scripts/runqemu-internal | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
> index fb51754..e346c64 100755
> --- a/scripts/runqemu-internal
> +++ b/scripts/runqemu-internal
> @@ -275,9 +275,6 @@ else
>
>          KERNCMDLINE="mem=$QEMU_MEMORY"
>          QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
> -        if [ $MACHINE = 'qemuarm64' ]; then
> -            QEMU_UI_OPTIONS="-nographic"
> -        fi
>
>          NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
>          export NFS_INSTANCE
> @@ -383,7 +380,11 @@ if [ "$MACHINE" = "qemuarm64" ]; then
>      QEMU=qemu-system-aarch64
>
>      export QEMU_AUDIO_DRV="none"
> -    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
> +    if [ "x$SERIALSTDIO" = "x" ] ; then
> +        QEMU_UI_OPTIONS="-nographic"
> +    else
> +        QEMU_UI_OPTIONS=""
> +    fi
>      if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
>          KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400
> mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
>          # qemu-system-aarch64 only support '-machine virt -cpu
> cortex-a57' for now
> --
> 1.9.1
>
>

[-- Attachment #2: Type: text/html, Size: 2629 bytes --]

Re: [PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 2193 bytes --]

These were literally just merged into master.

Ross

On 23 June 2015 at 11:57, Jagadeesh Krishnanjanappa <
jkrishnanjanappa@mvista.com> wrote:

> ping
>
> Regards,
> Jagadeesh
>
> On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
> jkrishnanjanappa@mvista.com> wrote:
>
>> Basically, runqemu script autodetects MACHINE type based on the
>> kernel image name; if MACHINE name is not specified. Since 'qemuarm'
>> string is common in both qemuarm amnd qemuarm64 kernel image names, the
>> MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel
>> image name is given in command line.
>>
>> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
>> ---
>>  scripts/runqemu | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/runqemu b/scripts/runqemu
>> index 84ece4d..09c507d 100755
>> --- a/scripts/runqemu
>> +++ b/scripts/runqemu
>> @@ -232,13 +232,13 @@ fi
>>
>>  if [ -z "$MACHINE" ]; then
>>      if [ "x$FSTYPE" = "xvmdk" ]; then
>> -        MACHINE=`basename $VM | sed -n
>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> +        MACHINE=`basename $VM | sed -n
>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>          if [ -z "$MACHINE" ]; then
>>              error "Unable to set MACHINE from vmdk filename [$VM]"
>>          fi
>>          echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
>>      else
>> -        MACHINE=`basename $KERNEL | sed -n
>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>> +        MACHINE=`basename $KERNEL | sed -n
>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>          if [ -z "$MACHINE" ]; then
>>              error "Unable to set MACHINE from kernel filename [$KERNEL]"
>>          fi
>> --
>> 1.9.1
>>
>>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

[-- Attachment #2: Type: text/html, Size: 3379 bytes --]

Re: [PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[Jagadeesh Krishnanjanappa]

[-- Attachment #1: Type: text/plain, Size: 2357 bytes --]

On Tue, Jun 23, 2015 at 4:36 PM, Burton, Ross <ross.burton@intel.com> wrote:

> These were literally just merged into master.
>
> Thanks.


> Ross
>
> On 23 June 2015 at 11:57, Jagadeesh Krishnanjanappa <
> jkrishnanjanappa@mvista.com> wrote:
>
>> ping
>>
>> Regards,
>> Jagadeesh
>>
>> On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
>> jkrishnanjanappa@mvista.com> wrote:
>>
>>> Basically, runqemu script autodetects MACHINE type based on the
>>> kernel image name; if MACHINE name is not specified. Since 'qemuarm'
>>> string is common in both qemuarm amnd qemuarm64 kernel image names, the
>>> MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel
>>> image name is given in command line.
>>>
>>> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
>>> ---
>>>  scripts/runqemu | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/scripts/runqemu b/scripts/runqemu
>>> index 84ece4d..09c507d 100755
>>> --- a/scripts/runqemu
>>> +++ b/scripts/runqemu
>>> @@ -232,13 +232,13 @@ fi
>>>
>>>  if [ -z "$MACHINE" ]; then
>>>      if [ "x$FSTYPE" = "xvmdk" ]; then
>>> -        MACHINE=`basename $VM | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>> +        MACHINE=`basename $VM | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>>          if [ -z "$MACHINE" ]; then
>>>              error "Unable to set MACHINE from vmdk filename [$VM]"
>>>          fi
>>>          echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
>>>      else
>>> -        MACHINE=`basename $KERNEL | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>> +        MACHINE=`basename $KERNEL | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>>          if [ -z "$MACHINE" ]; then
>>>              error "Unable to set MACHINE from kernel filename [$KERNEL]"
>>>          fi
>>> --
>>> 1.9.1
>>>
>>>
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>

[-- Attachment #2: Type: text/html, Size: 4042 bytes --]