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.2117.1575406821118162723 for ; Tue, 03 Dec 2019 13:00:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bhCzL51R; spf=pass (domain: redhat.com, ip: 205.139.110.61, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575406820; 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=3PkbLqhom6QvZ3XhYxQl/7pVGiXhV9l97Az8s+LEEKU=; b=bhCzL51RFkI38qFn074KljFOPt7JEpe7c+mclY/COkMOhPGyeCbgKJsWe7JK2ltZdE8c8K Mgki+ygyAkKwcvNg2kjxJKAF6zfmSim7TjVzsLGrvekxvME30ctATTaTzWJ4W2BdnutDod +9nwZnFebgE/fVTY3c2CL7XS+9P6I4E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-qr-ZIEqUP1WP3TAcnW9Hqg-1; Tue, 03 Dec 2019 16:00:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B34E5DBEF; Tue, 3 Dec 2019 21:00:17 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-183.ams2.redhat.com [10.36.117.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DEEC67E62; Tue, 3 Dec 2019 21:00:13 +0000 (UTC) Subject: Re: [PATCH 58/79] OvmfPkg/Qemu: Fix various typos To: Philippe Mathieu-Daude , devel@edk2.groups.io Cc: Antoine Coeur , Jordan Justen , Ard Biesheuvel References: <20191203161602.15969-1-philmd@redhat.com> <20191203161602.15969-59-philmd@redhat.com> From: "Laszlo Ersek" Message-ID: <45bfbd81-3c44-048f-327e-3c8c3fe3009c@redhat.com> Date: Tue, 3 Dec 2019 22:00:12 +0100 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: <20191203161602.15969-59-philmd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: qr-ZIEqUP1WP3TAcnW9Hqg-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 12/03/19 17:15, Philippe Mathieu-Daude wrote: > From: Antoine Coeur > > Fix various typos in comments and documentation. > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Reviewed-by: Philippe Mathieu-Daude > Signed-off-by: Philippe Mathieu-Daude > --- > OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf | 4 ++-- > OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf | 4 ++-- > OvmfPkg/AcpiPlatformDxe/Qemu.c | 4 ++-- > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 2 +- > OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c | 4 ++-- > OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c | 2 +- > OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c | 2 +- > OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 4 ++-- > OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c | 8 ++++---- > OvmfPkg/QemuVideoDxe/Driver.c | 2 +- > OvmfPkg/QemuVideoDxe/VbeShim.asm | 14 +++++++------- > 11 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf > index ca6326e833ed..8125fd0735a1 100644 > --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf > +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf > @@ -1,8 +1,8 @@ > ## @file > -# Component description file for QEMU Flash Fimware Volume Block DXE driver > +# Component description file for QEMU Flash Firmware Volume Block DXE driver > # module. > # > -# This DXE runtime driver implements and produces the Fimware Volue Block > +# This DXE runtime driver implements and produces the Firmware Volue Block > # Protocol for a QEMU flash device. > # > # Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
> diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf > index 241e912e2967..4715d5fc437e 100644 > --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf > +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf > @@ -1,8 +1,8 @@ > ## @file > -# Component description file for QEMU Flash Fimware Volume Block SMM driver > +# Component description file for QEMU Flash Firmware Volume Block SMM driver > # module. > # > -# This SMM driver implements and produces the SMM Fimware Volue Block Protocol > +# This SMM driver implements and produces the SMM Firmware Volue Block Protocol > # for a QEMU flash device. > # > # Copyright (C) 2015, Red Hat, Inc. > diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c > index f60e00f58af3..7fb42270043f 100644 > --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c > +++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c > @@ -137,7 +137,7 @@ QemuInstallAcpiMadtTable ( > ++Iso; > > // > - // Set Level-tiggered, Active High for all possible PCI link targets. > + // Set Level-triggered, Active High for all possible PCI link targets. > // > for (Loop = 0; Loop < 16; ++Loop) { > if ((PcdGet16 (Pcd8259LegacyModeEdgeLevel) & (1 << Loop)) == 0) { > @@ -148,7 +148,7 @@ QemuInstallAcpiMadtTable ( > Iso->Bus = 0x00; // ISA > Iso->Source = (UINT8) Loop; > Iso->GlobalSystemInterruptVector = (UINT32) Loop; > - Iso->Flags = 0x000D; // Level-tiggered, Active High > + Iso->Flags = 0x000D; // Level-triggered, Active High > ++Iso; > } > ASSERT ( > diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > index bc1a891dbaf1..75a3a88a3612 100644 > --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c > @@ -1113,7 +1113,7 @@ InstallQemuFwCfgTables ( > goto UninstallAcpiTables; > } > // > - // Ownership of S3Context has been transfered. > + // Ownership of S3Context has been transferred. > // > S3Context = NULL; > } > diff --git a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c b/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c > index 49bdfdf65043..1839f11f3301 100644 > --- a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c > +++ b/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c > @@ -1156,7 +1156,7 @@ PciBitFieldAndThenOr32 ( > Size into the buffer specified by Buffer. This function only allows the PCI > configuration registers from a single PCI function to be read. Size is > returned. When possible 32-bit PCI configuration read cycles are used to read > - from StartAdress to StartAddress + Size. Due to alignment restrictions, 8-bit > + from StartAddress to StartAddress + Size. Due to alignment restrictions, 8-bit > and 16-bit PCI configuration read cycles may be used at the beginning and the > end of the range. > > @@ -1193,7 +1193,7 @@ PciReadBuffer ( > Size from the buffer specified by Buffer. This function only allows the PCI > configuration registers from a single PCI function to be written. Size is > returned. When possible 32-bit PCI configuration write cycles are used to > - write from StartAdress to StartAddress + Size. Due to alignment restrictions, > + write from StartAddress to StartAddress + Size. Due to alignment restrictions, > 8-bit and 16-bit PCI configuration write cycles may be used at the beginning > and the end of the range. > > diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > index 586c2dec125c..ceffb17fa622 100644 > --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c > @@ -412,7 +412,7 @@ typedef struct { > If the call doesn't succeed, the contents of this > structure is indeterminate. > > - @param[out] IsFinal In case of successul parsing, this parameter signals > + @param[out] IsFinal In case of successful parsing, this parameter signals > whether the node just parsed is the final node in the > device path. The call after a final node will attempt > to start parsing the next path. If the call doesn't > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c > index 59d4680e5ec1..983680f8b6dd 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c > @@ -164,7 +164,7 @@ AllocFwCfgDmaAccessBuffer ( > > // > // As per UEFI spec, in order to map a host address with > - // BusMasterCommomBuffer64, the buffer must be allocated using the IOMMU > + // BusMasterCommonBuffer64, the buffer must be allocated using the IOMMU > // AllocateBuffer() > // > Status = mIoMmuProtocol->AllocateBuffer ( > diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c > index 859d1e70c5c2..7a6dfb9c21d6 100644 > --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c > +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c > @@ -21,7 +21,7 @@ > #include > > // > -// The protocols, PPI and GUID defintions for this module > +// The protocols, PPI and GUID definitions for this module > // > #include > // > @@ -41,7 +41,7 @@ typedef struct { > > EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = { > // > - // Systen NvStorage FVB > + // System NvStorage FVB > // > { > FixedPcdGet32 (PcdFlashNvStorageVariableSize) + > diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c > index edf438a422fa..b7b99129a80e 100644 > --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c > +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c > @@ -15,7 +15,7 @@ > **/ > > // > -// The protocols, PPI and GUID defintions for this module > +// The protocols, PPI and GUID definitions for this module > // > #include > #include > @@ -118,7 +118,7 @@ GetFvbInstance ( > returned > Global - Pointer to ESAL_FWB_GLOBAL that contains all > instance data > - FwhInstance - The EFI_FW_VOL_INSTANCE fimrware instance structure > + FwhInstance - The EFI_FW_VOL_INSTANCE firmware instance structure > > Returns: > EFI_SUCCESS - Successfully returns > @@ -695,7 +695,7 @@ FvbProtocolWrite ( > Writes data beginning at Lba:Offset from FV. The write terminates either > when *NumBytes of data have been written, or when a block boundary is > reached. *NumBytes is updated to reflect the actual number of bytes > - written. The write opertion does not include erase. This routine will > + written. The write operation does not include erase. This routine will > attempt to write only the specified bytes. If the writes do not stick, > it will return an error. > > @@ -740,7 +740,7 @@ FvbProtocolRead ( > Reads data beginning at Lba:Offset from FV. The Read terminates either > when *NumBytes of data have been read, or when a block boundary is > reached. *NumBytes is updated to reflect the actual number of bytes > - written. The write opertion does not include erase. This routine will > + written. The write operation does not include erase. This routine will > attempt to write only the specified bytes. If the writes do not stick, > it will return an error. > > diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c > index 522110ef4e09..6a4a860b3c25 100644 > --- a/OvmfPkg/QemuVideoDxe/Driver.c > +++ b/OvmfPkg/QemuVideoDxe/Driver.c > @@ -206,7 +206,7 @@ QemuVideoControllerDriverStart ( > OldTpl = gBS->RaiseTPL (TPL_CALLBACK); > > // > - // Allocate Private context data for GOP inteface. > + // Allocate Private context data for GOP interface. > // > Private = AllocateZeroPool (sizeof (QEMU_VIDEO_PRIVATE_DATA)); > if (Private == NULL) { > diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm > index cb2a60d8278d..1d284b264124 100644 > --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm > +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm > @@ -49,7 +49,7 @@ Handler: > je ReadEdid > cmp ah, 0x00 > je SetModeLegacy > - DebugLog StrUnkownFunction > + DebugLog StrUnknownFunction > Hang: > jmp Hang > > @@ -93,7 +93,7 @@ GetModeInfo: > and cx, ~0x4000 ; clear potentially set LFB bit in mode number > cmp cx, 0x00f1 > je KnownMode1 > - DebugLog StrUnkownMode > + DebugLog StrUnknownMode > jmp Hang > KnownMode1: > ; target (es:di) set on input > @@ -155,7 +155,7 @@ SetMode: > > cmp bx, 0x40f1 > je KnownMode2 > - DebugLog StrUnkownMode > + DebugLog StrUnknownMode > jmp Hang > KnownMode2: > > @@ -203,7 +203,7 @@ SetModeLegacy: > je KnownMode3 > cmp al, 0x12 > je KnownMode4 > - DebugLog StrUnkownMode > + DebugLog StrUnknownMode > jmp Hang > KnownMode3: > mov al, 0x30 > @@ -252,7 +252,7 @@ StrExitSuccess: > StrExitUnsupported: > db 'Unsupported', 0x0a, 0 > > -StrUnkownFunction: > +StrUnknownFunction: > db 'Unknown Function', 0x0a, 0 > > StrEnterGetInfo: > @@ -270,8 +270,8 @@ StrEnterSetMode: > StrEnterSetModeLegacy: > db 'SetModeLegacy', 0x0a, 0 > > -StrUnkownMode: > - db 'Unkown Mode', 0x0a, 0 > +StrUnknownMode: > + db 'Unknown Mode', 0x0a, 0 > > StrGetPmCapabilities: > db 'GetPmCapabilities', 0x0a, 0 > If you modify "VbeShim.asm", then please re-run "VbeShim.sh", for updating "VbeShim.h". Looks OK to me otherwise. (Note: I'm not commenting on the structure of the individual patches. It could be cleaned up some more; for example 56/79 has a Csm hunk that could go into 57/79. For another example, 56/79 and 58/79 split modifications to AcpiPlatformDxe between each other, quite confusingly -- why not fix all transfered -> transferred typos in the same module in a single patch? But, I don't want to introduce even more churn. So I'm not asking for restructuring the series.) Thanks, Laszlo