[edk2-devel] [PATCH v4 1/1] OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones
Laszlo Ersek
lersek at redhat.com
Wed Apr 29 20:49:34 UTC 2020
On 04/29/20 17:39, Rebecca Cran wrote:
> Generated mechanically with find/sed:
>
> find OvmfPkg -type f -exec sed -i -e 's/EFI_D_/DEBUG_/g' {} \;
>
> Signed-off-by: Rebecca Cran <rebecca at bsdio.com>
> Reviewed-by: Philippe Mathieu-Daude <philmd at redhat.com>
> Acked-by: Laszlo Ersek <lersek at redhat.com>
[...]
> 64 files changed, 356 insertions(+), 356 deletions(-)
(1) The diffstat has changed relative to v1 (which Phil reviewed):
62 files changed, 335 insertions(+), 335 deletions(-)
I think due to handling "VERBOSE" too, between v3 and v4. I think that
change / extension invalidates the previous R-b from Phil (and my
dependent A-b), so those tags should have been dropped.
Either way, we have to re-review this version.
(2) The patch does not apply on top of current master; i.e., commit
b2034179e8fe (".gitmodules: ignore untracked files in brotli",
2020-04-29).
The git-am error this time is not due to newline issues; those have been
fixed, I think. (Thanks!) Instead,
$ git am --reject ...
produces the following output in the "OvmfPkg/PlatformPei/MemDetect.c.rej" file:
> diff a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c (rejected hunks)
> @@ -389,7 +389,7 @@ GetFirstNonAddress (
> &FwCfgSize);
> if (!EFI_ERROR (Status)) {
> if (FwCfgSize >= sizeof MbString) {
> - DEBUG ((EFI_D_WARN,
> + DEBUG ((DEBUG_WARN,
> "%a: ignoring malformed 64-bit PCI host aperture size from fw_cfg\n",
> __FUNCTION__));
> } else {
which tells me that the patch has not been rebased on top of (at least)
commit 98800cce65c4 ("OvmfPkg/PlatformPei: parse "X-PciMmio64Mb" with
QemuFwCfgSimpleParserLib", 2020-04-28), which is the commit that changed
the context in question.
Knowing that, I guess I can apply the patch just before the series
containing 98800cce65c4 -- that is, on 64ab457d1f21 ("ReadMe: Convert to
rst and add Platform CI Status", 2020-04-28) -- and then rebase it
myself.
... The patch applies cleanly on 98800cce65c4, but the subsequent rebase
runs into the exact same conflict. (I'd have to fix it up manually.)
So I guess it's easier to just refresh this patch (please post v5) by
re-running the sed command on current master.
Thanks
Laszlo
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#58336): https://edk2.groups.io/g/devel/message/58336
Mute This Topic: https://groups.io/mt/73355301/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list