From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com)
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by groups.io with SMTP; Wed, 10 Apr 2019 07:16:40 -0700
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id B1B0F23E6D1;
	Wed, 10 Apr 2019 14:16:39 +0000 (UTC)
Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-133.rdu2.redhat.com [10.10.121.133])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B209F619AA;
	Wed, 10 Apr 2019 14:16:34 +0000 (UTC)
Subject: Re: [edk2-devel] [PATCH 1/5] OvmfPkg/build.sh: Require QEMU 1.6 or newer and always enable flash
To: devel@edk2.groups.io, jordan.l.justen@intel.com
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
 =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= <philmd@redhat.com>
References: <20190410093424.20365-1-jordan.l.justen@intel.com>
From: "Laszlo Ersek" <lersek@redhat.com>
Message-ID: <c122252e-6a88-9552-2098-2fd9c4aa3a1b@redhat.com>
Date: Wed, 10 Apr 2019 16:16:34 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <20190410093424.20365-1-jordan.l.justen@intel.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 10 Apr 2019 14:16:39 +0000 (UTC)
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

Hi Jordan,

I've asked Phil (CC'd) to review this series in my stead. I'll be happy
to provide an ACK when Phil gives his R-b (if I should forget, please
ping me separately).

In the future, please include a cover letter; a cumulative diffstat
usually helps with the review. (I've had to check all patches to see
that only build.sh is being modified.)

Thanks,
Laszlo

On 04/10/19 11:34, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
>  OvmfPkg/build.sh | 19 +++++++------------
>  1 file changed, 7 insertions(+), 12 deletions(-)
> 
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 4fcbdd2bc9..c92e90acfa 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -43,7 +43,6 @@ PLATFORMFILE=
>  THREADNUMBER=1
>  LAST_ARG=
>  RUN_QEMU=no
> -ENABLE_FLASH=no
>  
>  #
>  # Pick a default tool type for a given OS
> @@ -110,7 +109,7 @@ do
>          break
>          ;;
>        --enable-flash)
> -        ENABLE_FLASH=yes
> +        # Ignore old option. We always enable flash.
>          ;;
>        *)
>          BUILD_OPTIONS="$BUILD_OPTIONS $arg"
> @@ -210,7 +209,10 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
>                       awk '{print $2}')
>    case $qemu_version in
>      1.[6-9].*|[2-9].*.*|[1-9][0-9]*.*.*)
> -      ENABLE_FLASH=yes
> +      ;;
> +    *)
> +      echo qemu 1.6 or newer is required. detected: $qemu_version
> +      exit 1
>        ;;
>    esac
>  
> @@ -258,15 +260,8 @@ fi
>  
>  
>  if [[ "$RUN_QEMU" == "yes" ]]; then
> -  if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then
> -    mkdir $QEMU_FIRMWARE_DIR
> -  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"
> -  else
> -    QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
> -  fi
> +  FIRMWARE_IMAGE=$FV_DIR/OVMF.fd
> +  QEMU_COMMAND="$QEMU_COMMAND -pflash $FIRMWARE_IMAGE"
>    if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
>      QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
>    fi
>