[PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.

[PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.

[rebecca]

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 OvmfPkg/build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index e94aa2a37e..1c28e65404 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -174,11 +174,11 @@ case $PROCESSOR in
       # The user set the QEMU_COMMAND variable. We'll use it to run QEMU.
       #
       :
-    elif  [ -x `which qemu-system-i386` ]; then
+    elif command -v qemu-system-i386; then
       QEMU_COMMAND=qemu-system-i386
-    elif  [ -x `which qemu-system-x86_64` ]; then
+    elif command -v qemu-system-x86_64; then
       QEMU_COMMAND=qemu-system-x86_64
-    elif  [ -x `which qemu` ]; then
+    elif command -v qemu; then
       QEMU_COMMAND=qemu
     else
       echo Unable to find QEMU for IA32 architecture!
@@ -242,12 +242,12 @@ FV_DIR=$BUILD_ROOT/FV
 BUILD_ROOT_ARCH=$BUILD_ROOT/$BUILD_ROOT_ARCH
 QEMU_FIRMWARE_DIR=$BUILD_ROOT/QEMU
 
-if  [[ ! -f `which build` || ! -f `which GenFv` ]];
+if ! command -v build || ! command -v GenFv;
 then
   # build the tools if they don't yet exist. Bin scheme
   echo Building tools as they are not in the path
   make -C $WORKSPACE/BaseTools
-elif [[ ( -f `which build` ||  -f `which GenFv` )  && ! -d  $EDK_TOOLS_PATH/Source/C/bin ]];
+elif [[ ( $(command -v build) || $(command -v GenFv) ) && ! -d $EDK_TOOLS_PATH/Source/C/bin ]];
 then
   # build the tools if they don't yet exist. BinWrapper scheme
   echo Building tools no $EDK_TOOLS_PATH/Source/C/bin directory
-- 
2.22.0

[PATCH v2 2/3] OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu

[rebecca]

Specify the firmware to use via the newer '-drive if=pflash' syntax
which allows specifying the raw format parameter. This
avoids warnings with newer version of QEMU.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 OvmfPkg/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 1c28e65404..0219791aa8 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -263,7 +263,7 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
   fi
   ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
   if [[ "$ENABLE_FLASH" == "yes" ]]; then
-    QEMU_COMMAND="$QEMU_COMMAND -pflash $QEMU_FIRMWARE_DIR/bios.bin"
+    QEMU_COMMAND="$QEMU_COMMAND -drive if=pflash,format=raw,file=$QEMU_FIRMWARE_DIR/bios.bin"
   else
     QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
   fi
-- 
2.22.0

[PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA

[rebecca]

$ADD_QEMU_HDA was added because QEMU used to refuse to run without a
disk. Since newer versions run without any disks, remove it.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 OvmfPkg/build.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 0219791aa8..960382f633 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -213,17 +213,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
       ENABLE_FLASH=yes
       ;;
   esac
-
-  ADD_QEMU_HDA=yes
-  for arg in "$@"
-  do
-    case $arg in
-      -hd[a-d]|-fd[ab]|-cdrom)
-        ADD_QEMU_HDA=no
-        break
-        ;;
-    esac
-  done
 fi
 
 #
@@ -267,9 +256,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
   else
     QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
   fi
-  if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
-    QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
-  fi
   echo Running: $QEMU_COMMAND "$@"
   $QEMU_COMMAND "$@"
   exit $?
-- 
2.22.0

Re: [PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA

[Jordan Justen]

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

On 2019-07-24 14:44:05, Rebecca Cran wrote:
> $ADD_QEMU_HDA was added because QEMU used to refuse to run without a
> disk. Since newer versions run without any disks, remove it.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 0219791aa8..960382f633 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -213,17 +213,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>        ENABLE_FLASH=yes
>        ;;
>    esac
> -
> -  ADD_QEMU_HDA=yes
> -  for arg in "$@"
> -  do
> -    case $arg in
> -      -hd[a-d]|-fd[ab]|-cdrom)
> -        ADD_QEMU_HDA=no
> -        break
> -        ;;
> -    esac
> -  done
>  fi
>  
>  #
> @@ -267,9 +256,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>    else
>      QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
>    fi
> -  if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
> -    QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
> -  fi
>    echo Running: $QEMU_COMMAND "$@"
>    $QEMU_COMMAND "$@"
>    exit $?
> -- 
> 2.22.0
> 

Re: [PATCH v2 2/3] OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu

[Jordan Justen]

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

On 2019-07-24 14:44:04, Rebecca Cran wrote:
> Specify the firmware to use via the newer '-drive if=pflash' syntax
> which allows specifying the raw format parameter. This
> avoids warnings with newer version of QEMU.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 1c28e65404..0219791aa8 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -263,7 +263,7 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>    fi
>    ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
>    if [[ "$ENABLE_FLASH" == "yes" ]]; then
> -    QEMU_COMMAND="$QEMU_COMMAND -pflash $QEMU_FIRMWARE_DIR/bios.bin"
> +    QEMU_COMMAND="$QEMU_COMMAND -drive if=pflash,format=raw,file=$QEMU_FIRMWARE_DIR/bios.bin"
>    else
>      QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
>    fi
> -- 
> 2.22.0
> 

Re: [edk2-devel] [PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.

[Philippe Mathieu-Daudé]

Hi Rebecca,

It would be quicker to reply to your series if you use a cover letter.
(I'd have replied "series: Reviewed-by" instead of going thru each patch).

On 7/24/19 11:44 PM, rebecca@bsdio.com wrote:
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index e94aa2a37e..1c28e65404 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -174,11 +174,11 @@ case $PROCESSOR in
>        # The user set the QEMU_COMMAND variable. We'll use it to run QEMU.
>        #
>        :
> -    elif  [ -x `which qemu-system-i386` ]; then
> +    elif command -v qemu-system-i386; then
>        QEMU_COMMAND=qemu-system-i386
> -    elif  [ -x `which qemu-system-x86_64` ]; then
> +    elif command -v qemu-system-x86_64; then
>        QEMU_COMMAND=qemu-system-x86_64
> -    elif  [ -x `which qemu` ]; then
> +    elif command -v qemu; then
>        QEMU_COMMAND=qemu
>      else
>        echo Unable to find QEMU for IA32 architecture!
> @@ -242,12 +242,12 @@ FV_DIR=$BUILD_ROOT/FV
>  BUILD_ROOT_ARCH=$BUILD_ROOT/$BUILD_ROOT_ARCH
>  QEMU_FIRMWARE_DIR=$BUILD_ROOT/QEMU
>  
> -if  [[ ! -f `which build` || ! -f `which GenFv` ]];
> +if ! command -v build || ! command -v GenFv;
>  then
>    # build the tools if they don't yet exist. Bin scheme
>    echo Building tools as they are not in the path
>    make -C $WORKSPACE/BaseTools
> -elif [[ ( -f `which build` ||  -f `which GenFv` )  && ! -d  $EDK_TOOLS_PATH/Source/C/bin ]];
> +elif [[ ( $(command -v build) || $(command -v GenFv) ) && ! -d $EDK_TOOLS_PATH/Source/C/bin ]];
>  then
>    # build the tools if they don't yet exist. BinWrapper scheme
>    echo Building tools no $EDK_TOOLS_PATH/Source/C/bin directory
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [edk2-devel] [PATCH v2 2/3] OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu

[Philippe Mathieu-Daudé]

On 7/24/19 11:44 PM, rebecca@bsdio.com wrote:
> Specify the firmware to use via the newer '-drive if=pflash' syntax
> which allows specifying the raw format parameter. This
> avoids warnings with newer version of QEMU.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 1c28e65404..0219791aa8 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -263,7 +263,7 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>    fi
>    ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
>    if [[ "$ENABLE_FLASH" == "yes" ]]; then
> -    QEMU_COMMAND="$QEMU_COMMAND -pflash $QEMU_FIRMWARE_DIR/bios.bin"
> +    QEMU_COMMAND="$QEMU_COMMAND -drive if=pflash,format=raw,file=$QEMU_FIRMWARE_DIR/bios.bin"
>    else
>      QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
>    fi
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [edk2-devel] [PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA

[Philippe Mathieu-Daudé]

On 7/24/19 11:44 PM, rebecca@bsdio.com wrote:
> $ADD_QEMU_HDA was added because QEMU used to refuse to run without a
> disk. Since newer versions run without any disks, remove it.

Finally :)

Should we also update the wiki documentation?

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  OvmfPkg/build.sh | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 0219791aa8..960382f633 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -213,17 +213,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>        ENABLE_FLASH=yes
>        ;;
>    esac
> -
> -  ADD_QEMU_HDA=yes
> -  for arg in "$@"
> -  do
> -    case $arg in
> -      -hd[a-d]|-fd[ab]|-cdrom)
> -        ADD_QEMU_HDA=no
> -        break
> -        ;;
> -    esac
> -  done
>  fi
>  
>  #
> @@ -267,9 +256,6 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>    else
>      QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
>    fi
> -  if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
> -    QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
> -  fi
>    echo Running: $QEMU_COMMAND "$@"
>    $QEMU_COMMAND "$@"
>    exit $?
> 

Re: [edk2-devel] [PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.

[rebecca]

On 2019-07-25 05:07, Philippe Mathieu-Daudé wrote:
> It would be quicker to reply to your series if you use a cover letter.
> (I'd have replied "series: Reviewed-by" instead of going thru each patch).

Thanks, I'll try and remember that in future. I'm still learning how
best to send patches using "git send-email".


-- 
Rebecca Cran

Re: [edk2-devel] [PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.

[Philippe Mathieu-Daudé]

On 7/25/19 2:45 PM, rebecca@bsdio.com wrote:
> On 2019-07-25 05:07, Philippe Mathieu-Daudé wrote:
>> It would be quicker to reply to your series if you use a cover letter.
>> (I'd have replied "series: Reviewed-by" instead of going thru each patch).
> 
> Thanks, I'll try and remember that in future. I'm still learning how
> best to send patches using "git send-email".

Then I recommend you to look at the git-publish tool :)

I haven't used 'git send-email' since I started to use it:

  https://github.com/stefanha/git-publish

Re: [edk2-devel] [PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA

[rebecca]

On 2019-07-24 16:56, Jordan Justen wrote:
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
>
> On 2019-07-24 14:44:05, Rebecca Cran wrote:
>> $ADD_QEMU_HDA was added because QEMU used to refuse to run without a
>> disk. Since newer versions run without any disks, remove it.
>>
>> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>



Could someone push the series, please?


-- 
Rebecca Cran

Re: [edk2-devel] [PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA

[Jordan Justen]

On 2019-07-29 19:24:00,  wrote:
> On 2019-07-24 16:56, Jordan Justen wrote:
> > Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
> >
> > On 2019-07-24 14:44:05, Rebecca Cran wrote:
> >> $ADD_QEMU_HDA was added because QEMU used to refuse to run without a
> >> disk. Since newer versions run without any disks, remove it.
> >>
> >> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> 
> Could someone push the series, please?
> 

I pushed 2 & 3 as:

4634fd429e G OvmfPkg/build.sh: remove $ADD_QEMU_HDA
8fed4e47d9 G (origin/master, origin/HEAD) OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu

I still want to look closer at patch 1.

-Jordan