From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaV-0004Fm-IZ for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJNaS-0001DR-Ss for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaS-0001D8-N5 for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:52 -0500 From: Markus Armbruster Date: Wed, 13 Jan 2016 16:43:35 +0100 Message-Id: <1452699819-26608-38-git-send-email-armbru@redhat.com> In-Reply-To: <1452699819-26608-1-git-send-email-armbru@redhat.com> References: <1452699819-26608-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 37/41] error: Clean up errors with embedded newlines (again) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pavel Fedin , Markus Armbruster , Laszlo Ersek 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 ++-- kvm-all.c | 6 +++--- qemu-nbd.c | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0e5c86a..9e37186 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"); } diff --git a/kvm-all.c b/kvm-all.c index bd9e764..9148889 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2063,9 +2063,9 @@ void kvm_device_access(int fd, int group, uint64_t attr, write ? KVM_SET_DEVICE_ATTR : KVM_GET_DEVICE_ATTR, &kvmattr); if (err < 0) { - error_report("KVM_%s_DEVICE_ATTR failed: %s\n" - "Group %d attr 0x%016" PRIx64, write ? "SET" : "GET", - strerror(-err), group, attr); + error_report("KVM_%s_DEVICE_ATTR failed: %s", + write ? "SET" : "GET", strerror(-err)); + error_printf("Group %d attr 0x%016" PRIx64, group, attr); abort(); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index 023eacd..a4cf847 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -599,9 +599,8 @@ int main(int argc, char **argv) } if ((argc - optind) != 1) { - error_report("Invalid number of argument.\n" - "Try `%s --help' for more information.", - argv[0]); + error_report("Invalid number of arguments"); + error_printf("Try `%s --help' for more information.\n", argv[0]); exit(EXIT_FAILURE); } -- 2.4.3