From nobody Tue Feb 10 21:19:06 2026 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; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513877530415400.53119248445546; Thu, 21 Dec 2017 09:32:10 -0800 (PST) Received: from localhost ([::1]:60802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS4hS-0001uj-Di for importer@patchew.org; Thu, 21 Dec 2017 12:32:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS4fj-0000ur-5G for qemu-devel@nongnu.org; Thu, 21 Dec 2017 12:30:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS4ff-0004Wq-W7 for qemu-devel@nongnu.org; Thu, 21 Dec 2017 12:30:19 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:54783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS4ff-0004Vn-GK for qemu-devel@nongnu.org; Thu, 21 Dec 2017 12:30:15 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBLHRNCO160123; Thu, 21 Dec 2017 17:30:13 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2f0h6w82r1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Dec 2017 17:30:12 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBLHPBWG017012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 21 Dec 2017 17:25:11 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBLHPBee002730; Thu, 21 Dec 2017 17:25:11 GMT Received: from strongheart.us.oracle.com (/10.132.90.51) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 21 Dec 2017 09:25:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=GyXgFU092JoArQxexC2TCv9yza2OOPSOA3FcfmbVtI8=; b=Mv2bPa9chwSwxsftujv7eO/JHE0metC0cBm0XeX1bfsJ58rH/JyO4OT0e6SSx9WW5av5 ifnEm37yzJNmKipbxmQAI0OjZ1B0LAHnkCqPffN0p+i7eU5DIr+GrnfWu/2wtiZQ+aoa E8QGru3RmONmQ8TJObhhqup104Cjhia6osqVdFHJlzxjRdcZm8u1sZ05cRdcwFGuBGaW ywOxodau32cI9DAsPOtesvnc596koQuZHf/HItXq66RakwMVEcnzvR6HXNxLCO+0DWGP Z7BZSvnApr4Ioo/UQvmIy8NCFVnhRdznEc5qo1PxjijHIuEs/WRrU7S2svOVLdTduzDl XQ== From: Jack Schwartz To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 09:25:17 -0800 Message-Id: <1513877118-3149-4-git-send-email-jack.schwartz@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513877118-3149-1-git-send-email-jack.schwartz@oracle.com> References: <1513877118-3149-1-git-send-email-jack.schwartz@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8752 signatures=668651 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=751 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712210238 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH QEMU v1 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: ehabkost@redhat.com, konrad.wilk@oracle.com, daniel.kiper@oracle.com, mst@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Refer to field names when displaying fields in printf and debug statements. Signed-off-by: Jack Schwartz Reviewed-by: Daniel Kiper --- 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 964feaf..818728b 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 1.8.3.1