From nobody Sat Oct 25 08:52:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520421812036707.347643681642; Wed, 7 Mar 2018 03:23:32 -0800 (PST) Received: from localhost ([::1]:60859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etXAN-0007uG-Iw for importer@patchew.org; Wed, 07 Mar 2018 06:23:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etX5g-0004CJ-Th for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:18:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etX5f-0005iH-O9 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:18:36 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37116 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etX5f-0005i8-It for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:18:35 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B907D1436; Wed, 7 Mar 2018 11:18:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-216.ams2.redhat.com [10.36.116.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82464215CDAA; Wed, 7 Mar 2018 11:18:34 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 12:18:21 +0100 Message-Id: <20180307111822.29403-4-kwolf@redhat.com> In-Reply-To: <20180307111822.29403-1-kwolf@redhat.com> References: <20180307111822.29403-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 07 Mar 2018 11:18:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 07 Mar 2018 11:18:35 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/4] multiboot: Use header names when displaying fields X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jack.schwartz@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jack Schwartz Refer to field names when displaying fields in printf and debug statements. Signed-off-by: Jack Schwartz Reviewed-by: Daniel Kiper Signed-off-by: Kevin Wolf --- hw/i386/multiboot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 7d59cbe523..07fdccb84a 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -224,7 +224,7 @@ int load_multiboot(FWCfgState *fw_cfg, =20 mh_load_addr =3D ldl_p(header+i+16); if (mh_header_addr < mh_load_addr) { - fprintf(stderr, "invalid mh_load_addr address\n"); + fprintf(stderr, "invalid load_addr address\n"); exit(1); } =20 @@ -234,7 +234,7 @@ int load_multiboot(FWCfgState *fw_cfg, =20 if (mh_load_end_addr) { if (mh_load_end_addr < mh_load_addr) { - fprintf(stderr, "invalid mh_load_end_addr address\n"); + fprintf(stderr, "invalid load_end_addr address\n"); exit(1); } mb_load_size =3D mh_load_end_addr - mh_load_addr; @@ -247,7 +247,7 @@ int load_multiboot(FWCfgState *fw_cfg, } if (mh_bss_end_addr) { if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) { - fprintf(stderr, "invalid mh_bss_end_addr address\n"); + fprintf(stderr, "invalid bss_end_addr address\n"); exit(1); } mb_kernel_size =3D mh_bss_end_addr - mh_load_addr; @@ -255,10 +255,10 @@ int load_multiboot(FWCfgState *fw_cfg, mb_kernel_size =3D mb_load_size; } =20 - mb_debug("multiboot: mh_header_addr =3D %#x\n", mh_header_addr); - mb_debug("multiboot: mh_load_addr =3D %#x\n", mh_load_addr); - mb_debug("multiboot: mh_load_end_addr =3D %#x\n", mh_load_end_addr= ); - mb_debug("multiboot: mh_bss_end_addr =3D %#x\n", mh_bss_end_addr); + mb_debug("multiboot: header_addr =3D %#x\n", mh_header_addr); + mb_debug("multiboot: load_addr =3D %#x\n", mh_load_addr); + mb_debug("multiboot: load_end_addr =3D %#x\n", mh_load_end_addr); + mb_debug("multiboot: bss_end_addr =3D %#x\n", mh_bss_end_addr); mb_debug("qemu: loading multiboot kernel (%#x bytes) at %#x\n", mb_load_size, mh_load_addr); =20 @@ -361,7 +361,7 @@ int load_multiboot(FWCfgState *fw_cfg, stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot s= witch? */ stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); =20 - mb_debug("multiboot: mh_entry_addr =3D %#x\n", mh_entry_addr); + mb_debug("multiboot: entry_addr =3D %#x\n", mh_entry_addr); mb_debug(" mb_buf_phys =3D "TARGET_FMT_plx"\n", mbs.mb_buf= _phys); mb_debug(" mod_start =3D "TARGET_FMT_plx"\n", mbs.mb_buf= _phys + mbs.offset_mods); mb_debug(" mb_mods_count =3D %d\n", mbs.mb_mods_count); --=20 2.13.6