diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-08 13:25:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-08 13:25:35 +0100 |
| commit | f5edfcfafbc0fbe2e2270b9fbcbf9009399bc27a (patch) | |
| tree | 2cb2e479753c9b4a8bccc181e602fb5a7ed68727 /hw | |
| parent | 9efaf7f5f5729f7fa8dcf413fabe3d46ad382f90 (diff) | |
| parent | 7ea7d36e3493d4dac7f20e46d0ca499bbb3251a6 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc.c | 2 | ||||
| -rw-r--r-- | hw/mips/cps.c | 2 | ||||
| -rw-r--r-- | hw/nvram/fw_cfg.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_cpu_core.c | 2 | ||||
| -rw-r--r-- | hw/vfio/platform.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 47593b741a..022dd1b205 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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; diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 77c621797a..4ef337d5c4 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -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; } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index f10d5ec9c8..6a68e594d5 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -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; } diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 704803ac23..716f7c44cd 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -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; } diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 1798a00a3f..a559e7b659 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -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 { |