Commit 854a4436 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Multiboot patches

# gpg: Signature made Wed 07 Mar 2018 11:15:17 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  multiboot: fprintf(stderr...) -> error_report()
  multiboot: Use header names when displaying fields
  multiboot: Remove unused variables from multiboot.c
  multiboot: bss_end_addr can be zero

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f32408f3 4b9006a4

hw/i386/multiboot.c

+38 −39
Original line number Diff line number Diff line
@@ -31,12 +31,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
@@ -137,7 +138,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++;
@@ -179,12 +180,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;
@@ -193,7 +194,7 @@ 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);

        }
@@ -201,7 +202,7 @@ int load_multiboot(FWCfgState *fw_cfg, 
                               &elf_low, &elf_high, 0, I386_ELF_MACHINE,

                               0, 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;
@@ -210,11 +211,12 @@ 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_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. */
@@ -224,7 +226,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");

            error_report("invalid load_addr address");

            exit(1);

        }
@@ -233,43 +235,39 @@ int load_multiboot(FWCfgState *fw_cfg, 
        mh_entry_addr = ldl_p(header+i+28);



        if (mh_load_end_addr) {

            if (mh_bss_end_addr < mh_load_addr) {

                fprintf(stderr, "invalid mh_bss_end_addr address\n");

                exit(1);

            }

            mb_kernel_size = mh_bss_end_addr - mh_load_addr;



            if (mh_load_end_addr < mh_load_addr) {

                fprintf(stderr, "invalid mh_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_kernel_size = kernel_file_size - mb_kernel_text_offset;

            mb_load_size = mb_kernel_size;

            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)) {

                error_report("invalid bss_end_addr address");

                exit(1);

            }

            mb_kernel_size = mh_bss_end_addr - mh_load_addr;

        } else {

            mb_kernel_size = mb_load_size;

        }



        /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE.

        uint32_t mh_mode_type = ldl_p(header+i+32);

        uint32_t mh_width = ldl_p(header+i+36);

        uint32_t mh_height = ldl_p(header+i+40);

        uint32_t mh_depth = ldl_p(header+i+44); */



        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("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);
@@ -323,10 +321,10 @@ int load_multiboot(FWCfgState *fw_cfg, 
            hwaddr c = mb_add_cmdline(&mbs, tmpbuf);

            if ((next_space = strchr(tmpbuf, ' ')))

                *next_space = '\0';

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

            mb_debug("multiboot loading module: %s", tmpbuf);

            mb_mod_length = get_image_size(tmpbuf);

            if (mb_mod_length < 0) {

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

                error_report("Failed to open file '%s'", tmpbuf);

                exit(1);

            }
@@ -337,7 +335,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;
@@ -365,10 +363,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: mh_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_memdup(bootinfo, sizeof(bootinfo));