From patchwork Tue Mar 8 00:23:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8526931 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A3EB9F38C for ; Tue, 8 Mar 2016 00:24:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E92E2015A for ; Tue, 8 Mar 2016 00:24:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE41720155 for ; Tue, 8 Mar 2016 00:24:02 +0000 (UTC) Received: from localhost ([::1]:59326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad5RR-0005FN-Po for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Mar 2016 19:24:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad5RL-0005F7-Hd for qemu-devel@nongnu.org; Mon, 07 Mar 2016 19:23:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ad5RK-0003mP-NS for qemu-devel@nongnu.org; Mon, 07 Mar 2016 19:23:55 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:56124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad5RK-0003lc-Gu for qemu-devel@nongnu.org; Mon, 07 Mar 2016 19:23:54 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1ad5RA-0003dQ-8A; Tue, 08 Mar 2016 00:23:44 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 8 Mar 2016 00:23:43 +0000 Message-Id: <1457396623-27738-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Cc: Paolo Bonzini , "Michael S. Tsirkin" , Jens Wiklander , patches@linaro.org Subject: [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: Laszlo Ersek Reviewed-by: Michael S. Tsirkin --- 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