From 0bd67b62f13b15c36fa66304fffd70d01382e234 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 26 Jul 2018 16:24:45 +0200 Subject: [PATCH 3/8] multiboot: Use header names when displaying fields RH-Author: Kevin Wolf Message-id: <20180726162448.22072-4-kwolf@redhat.com> Patchwork-id: 81520 O-Subject: [RHEL-7.6/7.5.z qemu-kvm PATCH 3/6] multiboot: Use header names when displaying fields Bugzilla: 1549822 RH-Acked-by: John Snow RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Miroslav Rezanina 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: Kevin Wolf Signed-off-by: Miroslav Rezanina --- 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 ee2ebd1..c4a361f 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -203,7 +203,7 @@ int load_multiboot(FWCfgState *fw_cfg, mh_load_addr = 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); } @@ -213,7 +213,7 @@ int load_multiboot(FWCfgState *fw_cfg, 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 = mh_load_end_addr - mh_load_addr; @@ -226,7 +226,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 = mh_bss_end_addr - mh_load_addr; @@ -234,10 +234,10 @@ int load_multiboot(FWCfgState *fw_cfg, mb_kernel_size = mb_load_size; } - mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); - mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); - mb_debug("multiboot: mh_load_end_addr = %#x\n", mh_load_end_addr); - mb_debug("multiboot: mh_bss_end_addr = %#x\n", mh_bss_end_addr); + mb_debug("multiboot: header_addr = %#x\n", mh_header_addr); + mb_debug("multiboot: load_addr = %#x\n", mh_load_addr); + mb_debug("multiboot: load_end_addr = %#x\n", mh_load_end_addr); + mb_debug("multiboot: bss_end_addr = %#x\n", mh_bss_end_addr); mb_debug("qemu: loading multiboot kernel (%#x bytes) at %#x\n", mb_load_size, mh_load_addr); @@ -335,7 +335,7 @@ int load_multiboot(FWCfgState *fw_cfg, stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); - mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); + mb_debug("multiboot: entry_addr = %#x\n", mh_entry_addr); mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); mb_debug(" mod_start = "TARGET_FMT_plx"\n", mbs.mb_buf_phys + mbs.offset_mods); mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); -- 1.8.3.1