From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web12.59.1588193380769380754 for ; Wed, 29 Apr 2020 13:49:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jGQseTe+; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588193379; 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=DyV6e1kSNzvROylYVo18UZNsvtuhCtTwmdBWXQw3e2M=; b=jGQseTe+w6I8BrPEJBkTYq0n70WLsnkSpyAkF1xEWijQ7Qi0Fll7f0rStpRA7NpnGvz+or kk+D/U37MdrHmEpZW0q3sjLFtEUPaV4kie4b8phAhP4q4mbMCvbN1YwP/jXJd9cI22Eucb O+WzP6T3laYpMMYfv9tRK6rwzXGZH60= 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-166-lTR0EM0yNTqcn_iFF5Ns4A-1; Wed, 29 Apr 2020 16:49:37 -0400 X-MC-Unique: lTR0EM0yNTqcn_iFF5Ns4A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64D8B80572E; Wed, 29 Apr 2020 20:49:36 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-1.ams2.redhat.com [10.36.114.1]) by smtp.corp.redhat.com (Postfix) with ESMTP id 191AB2B4A5; Wed, 29 Apr 2020 20:49:34 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v4 1/1] OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones To: devel@edk2.groups.io, rebecca@bsdio.com Cc: Philippe Mathieu-Daude , Jordan Justen , Ard Biesheuvel References: <20200429153952.601446-1-rebecca@bsdio.com> From: "Laszlo Ersek" Message-ID: <90fb0512-4ec5-a3e5-055c-05ae8d9a4bb8@redhat.com> Date: Wed, 29 Apr 2020 22:49: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: <20200429153952.601446-1-rebecca@bsdio.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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 > Reviewed-by: Philippe Mathieu-Daude > Acked-by: Laszlo Ersek [...] > 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