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: 63648 Delivered-To: patches@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1741961lbc; Mon, 7 Mar 2016 16:23:47 -0800 (PST) X-Received: by 10.28.101.7 with SMTP id z7mr15059282wmb.92.1457396627263; Mon, 07 Mar 2016 16:23:47 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id bv6si255737wjc.97.2016.03.07.16.23.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Mar 2016 16:23:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk 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 Cc: patches@linaro.org, Jens Wiklander , Paolo Bonzini , "Michael S. Tsirkin" Subject: [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro 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 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 --- Oops... include/hw/loader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 Reviewed-by: Laszlo Ersek 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