Commit f5edfcfa authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-08-08' into staging 



Error reporting patches for 2016-08-08

# gpg: Signature made Mon 08 Aug 2016 08:14:49 BST
# gpg:                using RSA key 0x3870B400EB918653
# 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-2016-08-08:
  error: Fix error_printf() calls lacking newlines
  vfio: Use error_report() instead of error_printf() for errors
  checkpatch: Fix newline detection in error_setg() & friends
  error: Strip trailing '\n' from error string arguments (again)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9efaf7f5 7ea7d36e

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ ISADevice *pc_find_fdc0(void) 
        error_report("warning: multiple floppy disk controllers with "

                     "iobase=0x3f0 have been found");

        error_printf("the one being picked for CMOS setup might not reflect "

                     "your intent");

                     "your intent\n");

    }



    return state.floppy;

hw/mips/cps.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) 
    for (i = 0; i < s->num_vp; i++) {

        cpu = cpu_mips_init(s->cpu_model);

        if (cpu == NULL) {

            error_setg(errp, "%s: CPU initialization failed\n",  __func__);

            error_setg(errp, "%s: CPU initialization failed",  __func__);

            return;

        }

hw/nvram/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static int get_fw_cfg_order(FWCfgState *s, const char *name) 
    }



    /* Stick unknown stuff at the end. */

    error_report("warning: Unknown firmware file in legacy mode: %s\n", name);

    error_report("warning: Unknown firmware file in legacy mode: %s", name);

    return FW_CFG_ORDER_OVERRIDE_LAST;

}

hw/ppc/spapr_cpu_core.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, 
    }



    if (cc->core_id % smp_threads) {

        error_setg(&local_err, "invalid core id %d\n", cc->core_id);

        error_setg(&local_err, "invalid core id %d", cc->core_id);

        goto out;

    }

hw/vfio/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int vfio_populate_device(VFIODevice *vbasedev) 
        irq.index = i;

        ret = ioctl(vbasedev->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);

        if (ret) {

            error_printf("vfio: error getting device %s irq info",

            error_report("vfio: error getting device %s irq info",

                         vbasedev->name);

            goto irq_err;

        } else {