From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61])
 by mx.groups.io with SMTP id smtpd.web12.10533.1575896439088039186
 for <devel@edk2.groups.io>;
 Mon, 09 Dec 2019 05:00:39 -0800
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gIYmXm2H;
 spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: philmd@redhat.com)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1575896438;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=Dmv4cmy5yTcnPW891J1djiFZaEX0DOiLwsYynm2pFDE=;
	b=gIYmXm2HsZ59VAgtwzt+/u8nHA2IttBBpIsUCjhNg0O1lokaiEquAWAaw6pZCTyv71/gDr
	S8GSS1O0ys6FwWGo2TzBagVO5Cm3kJtuKXJxVz/f3i5vnSDrBisUe6uz+HdNBwg0Dil7Nj
	OUQb7EbkOJnAdpFzZArvzBKCT7ckRDM=
Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com
 [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-202-mgWZyDYIOB2f7i3_ZDAfHg-1; Mon, 09 Dec 2019 08:00:35 -0500
Received: by mail-wr1-f70.google.com with SMTP id d8so7432009wrq.12
        for <devel@edk2.groups.io>; Mon, 09 Dec 2019 05:00:35 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:subject:from:to:cc:references:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=y03PUs8pBPrwUCT/CaagABw6jXIPuvc3u0p3P0dXVVo=;
        b=An4C7B7UsaCDPeLOYgkdzYL2+syJbDmkCYcRLq7AB2ge58W7+f5bKb68DBvkMWFXFp
         WCT1zsTemc1k75KgP6Otv7FpXMj1jnXb+7dFUj8zewaFMrdygfaDlWvEkHI/7abc09WE
         ar7eGoFqj29kF+NB9zemuI+UYZgSKJ7JxQ6T1e87swqwDf6y3OUFwbITzs8Cvksl+oeM
         uaJGRvXwaLTEmFXENItjcYHjHPibDnuJatHdQv+lLD7aBDuusKaeDfI2AWxLFacd28/R
         wfd1zM82vizQHHCSWqkL7Kvh96o7S9YGzmbFaHgh3O8+VM+XLJWGsADAcN6p3P8gZRRW
         wUpA==
X-Gm-Message-State: APjAAAUW6UMqxV9rBiMBJuIc2Rf/0gO/usZre1qIDT4nhGThnrHnQzCg
	3X+MD4EWBqHCQaH0zXOVm2DEsUA+hBB5s2nSH1ejSqlSm6yMLwWw7aTflJWkYvxYpASRk5vzKmd
	q+pwAlzaBEPFPHg==
X-Received: by 2002:adf:f288:: with SMTP id k8mr2115341wro.301.1575896434453;
        Mon, 09 Dec 2019 05:00:34 -0800 (PST)
X-Google-Smtp-Source: APXvYqzIkqL4QPpK7qLDj5nS7DWVX9eY9h9lDQWhuirMV4ejrtipRtaSY+bGGREc9umaaJ16NhyhZw==
X-Received: by 2002:adf:f288:: with SMTP id k8mr2115306wro.301.1575896434159;
        Mon, 09 Dec 2019 05:00:34 -0800 (PST)
Return-Path: <philmd@redhat.com>
Received: from [192.168.50.32] (243.red-88-26-246.staticip.rima-tde.net. [88.26.246.243])
        by smtp.gmail.com with ESMTPSA id g9sm26846336wro.67.2019.12.09.05.00.33
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 09 Dec 2019 05:00:33 -0800 (PST)
Subject: Re: [PATCH 58/79] OvmfPkg/Qemu: Fix various typos
From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= <philmd@redhat.com>
To: Laszlo Ersek <lersek@redhat.com>, devel@edk2.groups.io
Cc: Antoine Coeur <coeur@gmx.fr>, Jordan Justen <jordan.l.justen@intel.com>,
 Ard Biesheuvel <ard.biesheuvel@linaro.org>, Gerd Hoffmann <kraxel@redhat.com>
References: <20191203161602.15969-1-philmd@redhat.com>
 <20191203161602.15969-59-philmd@redhat.com>
 <45bfbd81-3c44-048f-327e-3c8c3fe3009c@redhat.com>
 <516728a5-c9db-cb14-dd6b-2f74d0166b67@redhat.com>
Message-ID: <391a6f7b-ba08-eb43-a6b6-2615437435c2@redhat.com>
Date: Mon, 9 Dec 2019 14:00:32 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.2.2
MIME-Version: 1.0
In-Reply-To: <516728a5-c9db-cb14-dd6b-2f74d0166b67@redhat.com>
X-MC-Unique: mgWZyDYIOB2f7i3_ZDAfHg-1
X-Mimecast-Spam-Score: 0
Content-Language: en-US
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable

On 12/9/19 1:55 PM, Philippe Mathieu-Daud=C3=A9 wrote:
> Hi Laszlo,
>=20
> On 12/3/19 10:00 PM, Laszlo Ersek wrote:
>> On 12/03/19 17:15, Philippe Mathieu-Daude wrote:
>>> From: Antoine Coeur <coeur@gmx.fr>
>>>
>>> Fix various typos in comments and documentation.
>>>
>>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>>> Cc: Laszlo Ersek <lersek@redhat.com>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
>>> Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
>>> ---
>>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf=
 | =20
>>> 4 ++--
>>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 4 ++--
>>> =C2=A0 OvmfPkg/AcpiPlatformDxe/Qemu.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 4 ++--
>>> =C2=A0 OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 2 +-
>>> =C2=A0 OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 4 ++--
>>> =C2=A0 OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 2 +-
>>> =C2=A0 OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 2 +-
>>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 | =20
>>> 4 ++--
>>> =C2=A0 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 8 ++++----
>>> =C2=A0 OvmfPkg/QemuVideoDxe/Driver.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =20
>>> 2 +-
>>> =C2=A0 OvmfPkg/QemuVideoDxe/VbeShim.asm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 |=20
>>> 14 +++++++-------
>>> =C2=A0 11 files changed, 25 insertions(+), 25 deletions(-)
>>>
> [...]>> diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm=20
> b/OvmfPkg/QemuVideoDxe/VbeShim.asm
>>> index cb2a60d8278d..1d284b264124 100644
>>> --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm
>>> +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm
>>> @@ -49,7 +49,7 @@ Handler:
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 R=
eadEdid
>>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ah, 0x=
00
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 S=
etModeLegacy
>>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownFunction
>>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownFunction
>>> =C2=A0 Hang:
>>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang
>>> @@ -93,7 +93,7 @@ GetModeInfo:
>>> =C2=A0=C2=A0=C2=A0 and=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cx, ~0=
x4000 ; clear potentially set LFB bit in mode=20
>>> number
>>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cx, 0x=
00f1
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K=
nownMode1
>>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode
>>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode
>>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang
>>> =C2=A0 KnownMode1:
>>> =C2=A0=C2=A0=C2=A0 ; target (es:di) set on input
>>> @@ -155,7 +155,7 @@ SetMode:
>>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bx, 0x=
40f1
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K=
nownMode2
>>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode
>>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode
>>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang
>>> =C2=A0 KnownMode2:
>>> @@ -203,7 +203,7 @@ SetModeLegacy:
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K=
nownMode3
>>> =C2=A0=C2=A0=C2=A0 cmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 al, 0x=
12
>>> =C2=A0=C2=A0=C2=A0 je=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 K=
nownMode4
>>> -=C2=A0 DebugLog=C2=A0=C2=A0 StrUnkownMode
>>> +=C2=A0 DebugLog=C2=A0=C2=A0 StrUnknownMode
>>> =C2=A0=C2=A0=C2=A0 jmp=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hang
>>> =C2=A0 KnownMode3:
>>> =C2=A0=C2=A0=C2=A0 mov=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 al, 0x=
30
>>> @@ -252,7 +252,7 @@ StrExitSuccess:
>>> =C2=A0 StrExitUnsupported:
>>> =C2=A0=C2=A0=C2=A0 db 'Unsupported', 0x0a, 0
>>> -StrUnkownFunction:
>>> +StrUnknownFunction:
>>> =C2=A0=C2=A0=C2=A0 db 'Unknown Function', 0x0a, 0
>>> =C2=A0 StrEnterGetInfo:
>>> @@ -270,8 +270,8 @@ StrEnterSetMode:
>>> =C2=A0 StrEnterSetModeLegacy:
>>> =C2=A0=C2=A0=C2=A0 db 'SetModeLegacy', 0x0a, 0
>>> -StrUnkownMode:
>>> -=C2=A0 db 'Unkown Mode', 0x0a, 0
>>> +StrUnknownMode:
>>> +=C2=A0 db 'Unknown Mode', 0x0a, 0
>>> =C2=A0 StrGetPmCapabilities:
>>> =C2=A0=C2=A0=C2=A0 db 'GetPmCapabilities', 0x0a, 0
>>>
>>
>> If you modify "VbeShim.asm", then please re-run "VbeShim.sh", for
>> updating "VbeShim.h".
>=20
> The DEBUG macro at the head of VbeShim.asm is commented out:
>=20
>  =C2=A0 ;%define DEBUG
>=20
>=20
> So the string "Unknown Mode" is not used.
>=20
> Side note, running VbeShim.sh on Fedora 30 I get:
>=20
> $ git diff --word-diff
> --- a/OvmfPkg/QemuVideoDxe/VbeShim.h
> +++ b/OvmfPkg/QemuVideoDxe/VbeShim.h
> @@ -523,13 +523,13 @@ STATIC CONST UINT8 mVbeShim[] =3D {
>  =C2=A0 /* 0000020A cmp ax,0x4f02=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x=
3D, 0x02, 0x4F,
>  =C2=A0 /* 0000020D jz 0x269=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 */=C2=A0 0x74, 0x5A,
>  =C2=A0 /* 0000020F cmp ax,0x4f03=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x=
3D, 0x03, 0x4F,
>  =C2=A0 /* 00000212 jz [-word-]{+near+} 0x331=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 */=C2=A0 0x0F,=20
> 0x84, 0x1B, 0x01,
>  =C2=A0 /* 00000216 cmp ax,0x4f10=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x=
3D, 0x10, 0x4F,
>  =C2=A0 /* 00000219 jz [-word-]{+near+} 0x336=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 */=C2=A0 0x0F,=20
> 0x84, 0x19, 0x01,
>  =C2=A0 /* 0000021D cmp ax,0x4f15=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x=
3D, 0x15, 0x4F,
>  =C2=A0 /* 00000220 jz [-word-]{+near+} 0x338=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 */=C2=A0 0x0F,=20
> 0x84, 0x14, 0x01,
>  =C2=A0 /* 00000224 cmp ah,0x0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 */=C2=A0 0x80, 0xFC, 0x00,
>  =C2=A0 /* 00000227 jz [-word-]{+near+} 0x33a=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 */=C2=A0 0x0F,=20
> 0x84, 0x0F, 0x01,
>  =C2=A0 /* 0000022B jmp short 0x22b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xEB, 0xFE,
>  =C2=A0 /* 0000022D push es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x06,
>  =C2=A0 /* 0000022E push di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x57,
> @@ -547,7 +547,7 @@ STATIC CONST UINT8 mVbeShim[] =3D {
>  =C2=A0 /* 0000023F pop ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x1F,
>  =C2=A0 /* 00000240 pop di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x5F,
>  =C2=A0 /* 00000241 pop es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x07,
>  =C2=A0 /* 00000242 jmp[-word-] 0x34c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0x07, 0x01,
>  =C2=A0 /* 00000245 push es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x06,
>  =C2=A0 /* 00000246 push di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x57,
>  =C2=A0 /* 00000247 push ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x1E,
> @@ -568,7 +568,7 @@ STATIC CONST UINT8 mVbeShim[] =3D {
>  =C2=A0 /* 00000263 pop ds=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x1F,
>  =C2=A0 /* 00000264 pop di=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x5F,
>  =C2=A0 /* 00000265 pop es=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x07,
>  =C2=A0 /* 00000266 jmp[-word-] 0x34c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0xE3, 0x00,
>  =C2=A0 /* 00000269 push dx=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x52,
>  =C2=A0 /* 0000026A push ax=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 */=C2=A0 0x50,
>  =C2=A0 /* 0000026B cmp bx,0x40f1=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0x=
81, 0xFB, 0xF1, 0x40,
> @@ -688,14 +688,14 @@ STATIC CONST UINT8 mVbeShim[] =3D {
>  =C2=A0 /* 0000033C jz 0x345=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 */=C2=A0 0x74, 0x07,
>  =C2=A0 /* 0000033E cmp al,0x12=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=
=C2=A0 0x3C, 0x12,
>  =C2=A0 /* 00000340 jz 0x349=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 */=C2=A0 0x74, 0x07,
>  =C2=A0 /* 00000342 jmp[-word-] 0x22b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 */=C2=A0 0xE9, 0xE6, 0xFE,
>  =C2=A0 /* 00000345 mov al,0x30=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=
=C2=A0 0xB0, 0x30,
>  =C2=A0 /* 00000347 jmp short 0x34b=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xEB, 0x02,
>  =C2=A0 /* 00000349 mov al,0x20=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=
=C2=A0 0xB0, 0x20,
>  =C2=A0 /* 0000034B [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF,
>  =C2=A0 /* 0000034C mov ax,0x4f=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=
=C2=A0 0xB8, 0x4F, 0x00,
>  =C2=A0 /* 0000034F [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF,
>  =C2=A0 /* 00000350 mov ax,0x14f=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=
=A0 0xB8, 0x4F, 0x01,
>  =C2=A0 /* 00000353 [-iretw-]{+iret+}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 */=C2=A0 0xCF,
> };
> #endif
>=20
> The nasm packaged is:
>=20
> $ nasm -v
> NASM version 2.13.03 compiled on Feb=C2=A0 2 2019
>=20
> While NASM 2.12 is documented here:
>=20
> https://github.com/tianocore/tianocore.github.io/wiki/Nasm-Setup
>=20
> Should I downgrade it?

I forgot, to have VbeShim.sh succeed, I also have this local change:

-- >8 --
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.sh=20
b/OvmfPkg/QemuVideoDxe/VbeShim.sh
index aea28be35f5c..92b345befe1f 100755
--- a/OvmfPkg/QemuVideoDxe/VbeShim.sh
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.sh
@@ -28,7 +28,7 @@ trap exit_handler EXIT
  #
  # Assemble the source file.
  #
-nasm -o "$STEM".bin -- "$STEM".asm
+nasm -fbin "$STEM".asm -o "$STEM".bin

  #
  # Disassemble it, in order to get a binary dump associated with the=20
source.
---

Because I had this error:

$ sh -x OvmfPkg/QemuVideoDxe/VbeShim.sh
[...]
++ dirname -- OvmfPkg/QemuVideoDxe/VbeShim.sh
++ basename -- OvmfPkg/QemuVideoDxe/VbeShim.sh .sh
+ STEM=3DOvmfPkg/QemuVideoDxe/VbeShim
+ trap exit_handler EXIT
+ nasm -o OvmfPkg/QemuVideoDxe/VbeShim.bin --=20
OvmfPkg/QemuVideoDxe/VbeShim.asm
nasm: error: more than one input file specified
nasm: error: more than one input file specified
nasm: error: more than one input file specified
type `nasm -h' for help
+ exit_handler

Which is rather confuse, because the help is still recommending the=20
current form:

$ nasm -h
usage: nasm [-@ response file] [-o outfile] [-f format] [-l listfile]
             [options...] [--] filename
     or nasm -v (or --v) for version info

     -t          assemble in SciTech TASM compatible mode
     -E (or -e)  preprocess only (writes output to stdout by default)
     -a          don't preprocess (assemble only)
     -M          generate Makefile dependencies on stdout
     -MG         d:o, missing files assumed generated
     -MF <file>  set Makefile dependency file
     -MD <file>  assemble and generate dependencies
     -MT <file>  dependency target name
     -MQ <file>  dependency target name (quoted)
     -MP         emit phony target

     -Z<file>    redirect error messages to file
     -s          redirect error messages to stdout

     -g          generate debugging information

     -F format   select a debugging format

     -gformat    same as -g -F format

     -o outfile  write output to an outfile

     -f format   select an output format

     -l listfile write listing to a listfile

     -I<path>    adds a pathname to the include file path
     -O<digit>   optimize branch offsets
                 -O0: No optimization
                 -O1: Minimal optimization
                 -Ox: Multipass optimization (default)

     -P<file>    pre-includes a file
     -D<macro>[=3D<value>] pre-defines a macro
     -U<macro>   undefines a macro
     -X<format>  specifies error reporting format (gnu or vc)
     -w+foo      enables warning foo (equiv. -Wfoo)
     -w-foo      disable warning foo (equiv. -Wno-foo)

     -w[+-]error[=3Dfoo] can be used to promote warnings to errors
     -h           show invocation summary and exit

--prefix,--postfix
                 these options prepend or append the given string
                 to all extern and global variables