From nobody Mon Feb 9 23:01:02 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 152937402407129.978524724512226; Mon, 18 Jun 2018 19:07:04 -0700 (PDT) Received: from localhost ([::1]:38496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV62x-0000Zo-9i for importer@patchew.org; Mon, 18 Jun 2018 22:07:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV5i5-0001hA-7d for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:45:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV5i4-0008Qy-8X for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:45:29 -0400 Received: from mail-ot0-x241.google.com ([2607:f8b0:4003:c0f::241]:36222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fV5i3-0008Qk-Ul; Mon, 18 Jun 2018 21:45:28 -0400 Received: by mail-ot0-x241.google.com with SMTP id c15-v6so20777632otl.3; Mon, 18 Jun 2018 18:45:27 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id m62-v6sm7708135otc.71.2018.06.18.18.45.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 18:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/1JMGEGG5vdvuhQ0+7oWLrZYseFp3/5PfumkMqS4NXQ=; b=mWcMA6KxBCtqjTUXaEgMD5mEj9MV+vxSdczQx5RuHK9sicPUP5y5a16UEQrvOF3jj4 EyN0m8XY7fbdQxwnCSKFoeILSJdTcepjtzo4CNCN3TlrLpkXO4n2zn0l3RZV0dOEBV5a +cZHaKKY3Rc+1xwEyaAFbyG5vowrAz58pXlnc790GqE2vbBJXQfN13/3ZTf0TSkZ7SFw MioyR9GsC5W+J97GmJ0KIqqvGYh3JqGXyjaImhIg7K7ylS78wLAtcwy/S9eau7JCL8zv 58nzUNroRo+1ksKGoLPuHSMaelrv+pbTJUj8XBgPDx7qoW6FyadYFl+ao7/2kktlzBaN 955w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/1JMGEGG5vdvuhQ0+7oWLrZYseFp3/5PfumkMqS4NXQ=; b=P2jrdb/MExljQsFjYnPZiSb91vjbh4EhsEUTK23Hsz4H3fsRjpLR5Os9/Xk1f7R5cZ +nh7e+ftWO+bcKmj3xpScLLrlNuHnKFwJwWa+rDCsHNIZ2KWQAHy0T/Nix2ixqcBqGHg xz5IiFaF2NOtVpcgC+//1OSQa7rzYcvg3Iuw7oWs4Ldk145o9Ctnj7Pe/C/EcZER6+A9 vdDkghelr1KYohSUnxR2AHTr+UQHR3JEXiXBQlXwzIIpFks9Cih6UKp27ugtlQnj8ZV0 XcdrTg6KEFNPZppABXDOOkkzLxngxypzoPl/qEEdnxXbkMbViZSPEVdxe5mL3TU1BVlU 2FsA== X-Gm-Message-State: APt69E1m+4YQ5LAlQP4f6s42VSIMEEdBaC/kQWpaJ2O2FcAQitK3deRF 3nZ2vBZjn41Sg8Ie12u/JtllX8tX X-Google-Smtp-Source: ADUXVKLdHjYoE2WtZrk6GZmytldaqoEyW/fNP7GF33Q12diIZ87AyFveMuU9Y8tuq1iOyPY2pcxZXQ== X-Received: by 2002:a9d:300d:: with SMTP id d13-v6mr9892577otc.103.1529372726750; Mon, 18 Jun 2018 18:45:26 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 20:42:04 -0500 Message-Id: <20180619014319.28272-39-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> References: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::241 Subject: [Qemu-devel] [PATCH 038/113] 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: Kevin Wolf , qemu-stable@nongnu.org, Jack Schwartz 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" 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 (cherry picked from commit ce5eb6dc4dc5652f7e360a1db817f1d5dafab90f) Signed-off-by: Michael Roth --- 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 964feaf26e..818728bdf8 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.11.0