Commit 2f831d04 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-09-24' into staging 



Error reporting & miscellaneous patches for 2018-09-24

# gpg: Signature made Mon 24 Sep 2018 16:16:50 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2018-09-24:
  MAINTAINERS: Fix F: patterns that don't match anything
  Drop "qemu:" prefix from error_report() arguments
  qemu-error: make use of {error, warn}_report_once_cond
  qemu-error: add {error, warn}_report_once_cond

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8ca19bd8 c468e368

MAINTAINERS

+4 −6
Original line number Diff line number Diff line
@@ -889,12 +889,11 @@ Sun4m 
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

S: Maintained

F: hw/sparc/sun4m.c

F: hw/sparc/sun4m_iommu.c

F: hw/dma/sparc32_dma.c

F: hw/dma/sun4m_iommu.c

F: hw/misc/eccmemctl.c

F: hw/misc/slavio_misc.c

F: include/hw/sparc/sparc32_dma.h

F: include/hw/sparc/sun4m.h

F: pc-bios/openbios-sparc32



Sun4u
@@ -1422,7 +1421,7 @@ F: qemu-io* 
F: tests/qemu-iotests/

F: util/qemu-progress.c

F: qobject/block-qdict.c

F: test/check-block-qdict.c

F: tests/check-block-qdict.c

T: git git://repo.or.cz/qemu/kevin.git block



Block I/O path
@@ -1455,7 +1454,7 @@ F: blockjob.c 
F: include/block/blockjob.h

F: job.c

F: job-qmp.c

F: include/block/job.h

F: include/qemu/job.h

F: block/backup.c

F: block/commit.c

F: block/stream.c
@@ -1671,7 +1670,6 @@ QAPI Schema 
M: Eric Blake <eblake@redhat.com>

M: Markus Armbruster <armbru@redhat.com>

S: Supported

F: qapi-schema.json

F: qapi/*.json

T: git git://repo.or.cz/qemu/armbru.git qapi-next
@@ -1790,7 +1788,7 @@ F: migration/ 
F: scripts/vmstate-static-checker.py

F: tests/vmstate-static-checker-data/

F: tests/migration-test.c

F: docs/devel/migration.txt

F: docs/devel/migration.rst

F: qapi/migration.json



Seccomp

hw/i386/multiboot.c

+4 −4
Original line number Diff line number Diff line
@@ -181,12 +181,12 @@ int load_multiboot(FWCfgState *fw_cfg, 
    if (!is_multiboot)

        return 0; /* no multiboot */



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

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

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

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



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

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

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

    }

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

        uint64_t elf_entry;
@@ -216,7 +216,7 @@ int load_multiboot(FWCfgState *fw_cfg, 
            exit(1);

        }



        mb_debug("qemu: loading multiboot-elf kernel "

        mb_debug("loading multiboot-elf kernel "

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

                 mb_kernel_size, (size_t)mh_entry_addr);

    } else {
@@ -270,7 +270,7 @@ int load_multiboot(FWCfgState *fw_cfg, 
        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_debug("loading multiboot kernel (%#x bytes) at %#x",

                 mb_load_size, mh_load_addr);



        mbs.mb_buf = g_malloc(mb_kernel_size);

hw/ppc/e500.c

+2 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ void ppce500_init(MachineState *machine) 
        payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL,

                                   NULL, NULL);

        if (payload_size < 0) {

            error_report("qemu: could not load firmware '%s'", filename);

            error_report("could not load firmware '%s'", filename);

            exit(1);

        }

    }
@@ -1056,7 +1056,7 @@ void ppce500_init(MachineState *machine) 
     */

    dt_base = (loadaddr + payload_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK;

    if (dt_base + DTB_MAX_SIZE > ram_size) {

            error_report("qemu: not enough memory for device tree");

            error_report("not enough memory for device tree");

            exit(1);

    }

hw/ppc/sam460ex.c

+4 −4
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int sam460ex_load_uboot(void) 
    if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size,

                               blk, 64 * KiB, fl_sectors,

                               1, 0x89, 0x18, 0x0000, 0x0, 1)) {

        error_report("qemu: Error registering flash memory.");

        error_report("Error registering flash memory");

        /* XXX: return an error instead? */

        exit(1);

    }
@@ -545,7 +545,7 @@ static void sam460ex_init(MachineState *machine) 
    if (!machine->kernel_filename) {

        success = sam460ex_load_uboot();

        if (success < 0) {

            error_report("qemu: could not load firmware");

            error_report("could not load firmware");

            exit(1);

        }

    }
@@ -564,7 +564,7 @@ static void sam460ex_init(MachineState *machine) 
        }

        /* XXX try again as binary */

        if (success < 0) {

            error_report("qemu: could not load kernel '%s'",

            error_report("could not load kernel '%s'",

                    machine->kernel_filename);

            exit(1);

        }
@@ -576,7 +576,7 @@ static void sam460ex_init(MachineState *machine) 
                                          RAMDISK_ADDR,

                                          machine->ram_size - RAMDISK_ADDR);

        if (initrd_size < 0) {

            error_report("qemu: could not load ram disk '%s' at %x",

            error_report("could not load ram disk '%s' at %x",

                    machine->initrd_filename, RAMDISK_ADDR);

            exit(1);

        }

hw/riscv/sifive_e.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static uint64_t load_kernel(const char *kernel_filename) 
    if (load_elf(kernel_filename, NULL, NULL,

                 &kernel_entry, NULL, &kernel_high,

                 0, EM_RISCV, 1, 0) < 0) {

        error_report("qemu: could not load kernel '%s'", kernel_filename);

        error_report("could not load kernel '%s'", kernel_filename);

        exit(1);

    }

    return kernel_entry;