From a6a1a4a3a9890749501a2a22f6883397a8579b60 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Thu, 26 Jul 2018 16:24:46 +0200

Subject: [PATCH 4/8] multiboot: fprintf(stderr...) -> error_report()

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180726162448.22072-5-kwolf@redhat.com>

Patchwork-id: 81519

O-Subject: [RHEL-7.6/7.5.z qemu-kvm PATCH 4/6] multiboot: fprintf(stderr...) -> error_report()

Bugzilla: 1549822

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Jack Schwartz <jack.schwartz@oracle.com>

Change all fprintf(stderr...) calls in hw/i386/multiboot.c to call

error_report() instead, including the mb_debug macro.  Remove the "\n"

from strings passed to all modified calls, since error_report() appends

one.

Signed-off-by: Jack Schwartz <jack.schwartz@oracle.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 4b9006a41ea8818f2385ae5228e07f211bb4a33d)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/i386/multiboot.c | 53 ++++++++++++++++++++++++++++-------------------------

 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c

index c4a361f..56889e8 100644

--- a/hw/i386/multiboot.c

+++ b/hw/i386/multiboot.c

@@ -28,12 +28,13 @@

 #include "hw/loader.h"

 #include "elf.h"

 #include "sysemu/sysemu.h"

+#include "qemu/error-report.h"

 /* Show multiboot debug output */

 //#define DEBUG_MULTIBOOT

 #ifdef DEBUG_MULTIBOOT

-#define mb_debug(a...) fprintf(stderr, ## a)

+#define mb_debug(a...) error_report(a)

 #else

 #define mb_debug(a...)

 #endif

@@ -118,7 +119,7 @@ static void mb_add_mod(MultibootState *s,

     stl_p(p + MB_MOD_END,     end);

     stl_p(p + MB_MOD_CMDLINE, cmdline_phys);

-    mb_debug("mod%02d: "TARGET_FMT_plx" - "TARGET_FMT_plx"\n",

+    mb_debug("mod%02d: "TARGET_FMT_plx" - "TARGET_FMT_plx,

              s->mb_mods_count, start, end);

     s->mb_mods_count++;

@@ -159,12 +160,12 @@ int load_multiboot(FWCfgState *fw_cfg,

     if (!is_multiboot)

         return 0; /* no multiboot */

-    mb_debug("qemu: I believe we found a multiboot image!\n");

+    mb_debug("qemu: I believe we found a multiboot image!");

     memset(bootinfo, 0, sizeof(bootinfo));

     memset(&mbs, 0, sizeof(mbs));

     if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */

-        fprintf(stderr, "qemu: multiboot knows VBE. we don't.\n");

+        error_report("qemu: multiboot knows VBE. we don't.");

     }

     if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */

         uint64_t elf_entry;

@@ -173,14 +174,14 @@ int load_multiboot(FWCfgState *fw_cfg,

         fclose(f);

         if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) {

-            fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n");

+            error_report("Cannot load x86-64 image, give a 32bit one.");

             exit(1);

         }

         kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,

                                &elf_low, &elf_high, 0, ELF_MACHINE, 0);

         if (kernel_size < 0) {

-            fprintf(stderr, "Error while loading elf kernel\n");

+            error_report("Error while loading elf kernel");

             exit(1);

         }

         mh_load_addr = elf_low;

@@ -189,12 +190,13 @@ int load_multiboot(FWCfgState *fw_cfg,

         mbs.mb_buf = g_malloc(mb_kernel_size);

         if (rom_copy(mbs.mb_buf, mh_load_addr, mb_kernel_size) != mb_kernel_size) {

-            fprintf(stderr, "Error while fetching elf kernel from rom\n");

+            error_report("Error while fetching elf kernel from rom");

             exit(1);

         }

-        mb_debug("qemu: loading multiboot-elf kernel (%#x bytes) with entry %#zx\n",

-                  mb_kernel_size, (size_t)mh_entry_addr);

+        mb_debug("qemu: loading multiboot-elf kernel "

+                 "(%#x bytes) with entry %#zx",

+                 mb_kernel_size, (size_t)mh_entry_addr);

     } else {

         /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_ADDR. */

         uint32_t mh_header_addr = ldl_p(header+i+12);

@@ -203,7 +205,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 load_addr address\n");

+            error_report("invalid load_addr address");

             exit(1);

         }

@@ -213,20 +215,20 @@ int load_multiboot(FWCfgState *fw_cfg,

         if (mh_load_end_addr) {

             if (mh_load_end_addr < mh_load_addr) {

-                fprintf(stderr, "invalid load_end_addr address\n");

+                error_report("invalid load_end_addr address");

                 exit(1);

             }

             mb_load_size = mh_load_end_addr - mh_load_addr;

         } else {

             if (kernel_file_size < mb_kernel_text_offset) {

-                fprintf(stderr, "invalid kernel_file_size\n");

+                error_report("invalid kernel_file_size");

                 exit(1);

             }

             mb_load_size = kernel_file_size - mb_kernel_text_offset;

         }

         if (mh_bss_end_addr) {

             if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) {

-                fprintf(stderr, "invalid bss_end_addr address\n");

+                error_report("invalid bss_end_addr address");

                 exit(1);

             }

             mb_kernel_size = mh_bss_end_addr - mh_load_addr;

@@ -234,17 +236,17 @@ int load_multiboot(FWCfgState *fw_cfg,

             mb_kernel_size = mb_load_size;

         }

-        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_debug("multiboot: header_addr = %#x", mh_header_addr);

+        mb_debug("multiboot: load_addr = %#x", mh_load_addr);

+        mb_debug("multiboot: load_end_addr = %#x", mh_load_end_addr);

+        mb_debug("multiboot: bss_end_addr = %#x", mh_bss_end_addr);

+        mb_debug("qemu: loading multiboot kernel (%#x bytes) at %#x",

                  mb_load_size, mh_load_addr);

         mbs.mb_buf = g_malloc(mb_kernel_size);

         fseek(f, mb_kernel_text_offset, SEEK_SET);

         if (fread(mbs.mb_buf, 1, mb_load_size, f) != mb_load_size) {

-            fprintf(stderr, "fread() failed\n");

+            error_report("fread() failed");

             exit(1);

         }

         memset(mbs.mb_buf + mb_load_size, 0, mb_kernel_size - mb_load_size);

@@ -297,7 +299,7 @@ int load_multiboot(FWCfgState *fw_cfg,

             mb_debug("multiboot loading module: %s\n", initrd_filename);

             mb_mod_length = get_image_size(initrd_filename);

             if (mb_mod_length < 0) {

-                fprintf(stderr, "Failed to open file '%s'\n", initrd_filename);

+                error_report("Failed to open file '%s'\n", initrd_filename);

                 exit(1);

             }

@@ -308,7 +310,7 @@ int load_multiboot(FWCfgState *fw_cfg,

             mb_add_mod(&mbs, mbs.mb_buf_phys + offs,

                        mbs.mb_buf_phys + offs + mb_mod_length, c);

-            mb_debug("mod_start: %p\nmod_end:   %p\n  cmdline: "TARGET_FMT_plx"\n",

+            mb_debug("mod_start: %p\nmod_end:   %p\n  cmdline: "TARGET_FMT_plx,

                      (char *)mbs.mb_buf + offs,

                      (char *)mbs.mb_buf + offs + mb_mod_length, c);

             initrd_filename = next_initrd+1;

@@ -335,10 +337,11 @@ 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: 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);

+    mb_debug("multiboot: entry_addr = %#x", mh_entry_addr);

+    mb_debug("           mb_buf_phys   = "TARGET_FMT_plx, mbs.mb_buf_phys);

+    mb_debug("           mod_start     = "TARGET_FMT_plx,

+             mbs.mb_buf_phys + mbs.offset_mods);

+    mb_debug("           mb_mods_count = %d", mbs.mb_mods_count);

     /* save bootinfo off the stack */

     mb_bootinfo_data = g_malloc(sizeof(bootinfo));

-- 

1.8.3.1