From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.128.51, mailfrom: philmd@redhat.com)
Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51])
 by groups.io with SMTP; Wed, 10 Apr 2019 07:45:54 -0700
Received: by mail-wm1-f51.google.com with SMTP id a184so2916767wma.2
        for <devel@edk2.groups.io>; Wed, 10 Apr 2019 07:45:53 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id
         :date:user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=8Q62tqSnoliOk8CHhbQR82pNwrePpuHzP/S/lVdkZRk=;
        b=ZYWDl5kVKMAvLk+5RZKzWuFf8iEn/komt0nkE4O87/r3PP9MjonSGP8jfC8DXXUFA0
         q4vX30aa0cV25SR5MObd70zb6q2c5xa+KvPBuxoBET/490urjgTOL6UCYMMdRIG7R9tN
         O1LPG/JB8+WJvBXzfLvCMniWNuHav9s/XFzy1Y1RU7TgGgC1e9iJVoYcJwg/YQwdiSLk
         GLoVoMtiJE0pBwAr4vO6q7Kbm4xpe2ZSm2B6t9zmndntP8vCQDhvGqYTJjpLeM1Luus2
         mlfyIqmECme1GdNivlJ+SwHIce/6TPW3Y1QXnK2cLjlhIRjz33xRvF/2NqRi8luYVkgj
         uAQw==
X-Gm-Message-State: APjAAAXfkSVC1Vq2PUewiQW1j4sETAmT2DKigJYu1ggxbLKPrDsJJ77g
	gonlmR7iTmbSdlTWYKYDdB9Ovg==
X-Google-Smtp-Source: APXvYqx55j5a3DquiCLfMYQbEVc7/WDL1SE8D09tr6CoU8IRVx28X/WhzbaL8hGtV2o/9joINt+ECQ==
X-Received: by 2002:a7b:c147:: with SMTP id z7mr3066848wmi.67.1554907552147;
        Wed, 10 Apr 2019 07:45:52 -0700 (PDT)
Return-Path: <philmd@redhat.com>
Received: from [10.201.33.53] ([195.166.127.210])
        by smtp.gmail.com with ESMTPSA id h12sm33849696wrq.95.2019.04.10.07.45.51
        (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128);
        Wed, 10 Apr 2019 07:45:51 -0700 (PDT)
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: Laszlo Ersek <lersek@redhat.com>,
 Ard Biesheuvel <ard.biesheuvel@linaro.org>
References: <20190410093424.20365-1-jordan.l.justen@intel.com>
From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= <philmd@redhat.com>
Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE;
 url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE
Message-ID: <608791d7-8d9b-ca17-0818-e413eac9c733@redhat.com>
Date: Wed, 10 Apr 2019 16:45:50 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <20190410093424.20365-1-jordan.l.justen@intel.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

On 4/10/19 11:34 AM, 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
> 

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