From 433672b0d5cfdd4acbf269e6aef079e162af5bad Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:24 +0100 Subject: error: Clean up errors with embedded newlines (again) The arguments of error_report() should yield a short error string without newlines. A few places try to print additional help after the error message by embedding newlines in the error string. That's nice, but let's do it the right way. Commit 474c213 cleaned up some, but they keep coming back. Offenders tracked down with the Coccinelle semantic patch from commit 312fd5f. Cc: Laszlo Ersek Cc: Pavel Fedin Signed-off-by: Markus Armbruster Reviewed-by: Laszlo Ersek Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster --- hw/i386/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0e5c86ae1b..9e37186776 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -377,8 +377,8 @@ ISADevice *pc_find_fdc0(void) if (state.multiple) { error_report("warning: multiple floppy disk controllers with " - "iobase=0x3f0 have been found;\n" - "the one being picked for CMOS setup might not reflect " + "iobase=0x3f0 have been found"); + error_printf("the one being picked for CMOS setup might not reflect " "your intent"); } -- cgit v1.2.3-55-g7522