From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adaWH-0004EA-GD for qemu-devel@nongnu.org; Wed, 09 Mar 2016 04:35:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adaWD-0006Vi-Ng for qemu-devel@nongnu.org; Wed, 09 Mar 2016 04:35:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adaWD-0006Vb-HF for qemu-devel@nongnu.org; Wed, 09 Mar 2016 04:35:01 -0500 Date: Wed, 9 Mar 2016 11:34:58 +0200 From: "Michael S. Tsirkin" Message-ID: <20160309113409-mutt-send-email-mst@redhat.com> References: <1457396623-27738-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1457396623-27738-1-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Jens Wiklander , qemu-devel@nongnu.org, patches@linaro.org On Tue, Mar 08, 2016 at 12:23:43AM +0000, Peter Maydell wrote: > From: Jens Wiklander > > Fix a typo in the load_image_mr() macro: 'mr' was written when > the parameter name is '_mr'. (This had no visible effects since > the single use of the macro used 'mr' as the argument.) > > Fixes 76151cacfe956248a25b38b5e8429465584f47bb "loader: Add > load_image_mr() to load ROM image to a MemoryRegion" > > Signed-off-by: Jens Wiklander > Reviewed-by: Peter Maydell > [PMM: tweaked commit message] > Signed-off-by: Peter Maydell > --- Reviewed-by: Michael S. Tsirkin Peter, you are merging this, right? > Oops... > > include/hw/loader.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/hw/loader.h b/include/hw/loader.h > index 0ba7808..b3d1358 100644 > --- a/include/hw/loader.h > +++ b/include/hw/loader.h > @@ -137,7 +137,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); > #define rom_add_blob_fixed(_f, _b, _l, _a) \ > rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL) > #define rom_add_file_mr(_f, _mr, _i) \ > - rom_add_file(_f, NULL, 0, _i, false, mr) > + rom_add_file(_f, NULL, 0, _i, false, _mr) > > #define PC_ROM_MIN_VGA 0xc0000 > #define PC_ROM_MIN_OPTION 0xc8000 > -- > 1.9.1