From df3c286c53ac51e7267f2761c7a0c62e11b6e815 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 3 Aug 2016 13:37:51 +0200 Subject: error: Strip trailing '\n' from error string arguments (again) Commit 9af9e0f, 6daf194d, be62a2eb and 312fd5f got rid of a bunch, but they keep coming back. checkpatch.pl tries to flag them since commit 5d596c2, but it's not very good at it. Offenders tracked down with Coccinelle script scripts/coccinelle/err-bad-newline.cocci, an updated version of the script from commit 312fd5f. Signed-off-by: Markus Armbruster Message-Id: <1470224274-31522-2-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- hw/mips/cps.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/ppc/spapr_cpu_core.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hw') 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 170ed154a6..3ec47b7954 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -234,7 +234,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; } -- cgit v1.2.3-55-g7522 From fea1c0999a67217207ece63a25ed88c796c19515 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 3 Aug 2016 13:37:53 +0200 Subject: vfio: Use error_report() instead of error_printf() for errors Cc: Alex Williamson Signed-off-by: Markus Armbruster Message-Id: <1470224274-31522-4-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- hw/vfio/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw') 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 { -- cgit v1.2.3-55-g7522 From 7ea7d36e3493d4dac7f20e46d0ca499bbb3251a6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 3 Aug 2016 13:37:54 +0200 Subject: error: Fix error_printf() calls lacking newlines Signed-off-by: Markus Armbruster Message-Id: <1470224274-31522-5-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- hw/i386/pc.c | 2 +- kvm-all.c | 2 +- ui/vnc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hw') 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/kvm-all.c b/kvm-all.c index 65608def36..ebf35b0c5b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2143,7 +2143,7 @@ void kvm_device_access(int fd, int group, uint64_t attr, if (err < 0) { error_report("KVM_%s_DEVICE_ATTR failed: %s", write ? "SET" : "GET", strerror(-err)); - error_printf("Group %d attr 0x%016" PRIx64, group, attr); + error_printf("Group %d attr 0x%016" PRIx64 "\n", group, attr); abort(); } } diff --git a/ui/vnc.c b/ui/vnc.c index 4ce903429f..853b57e982 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3201,7 +3201,7 @@ int vnc_display_password(const char *id, const char *password) } if (vs->auth == VNC_AUTH_NONE) { error_printf_unless_qmp("If you want use passwords please enable " - "password auth using '-vnc ${dpy},password'."); + "password auth using '-vnc ${dpy},password'.\n"); return -EINVAL; } -- cgit v1.2.3-55-g7522