From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrVbm-0003O3-BW for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrVbl-0004mf-FQ for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:38:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrVbl-0004mY-A8 for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:38:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 0A784AACF1 for ; Wed, 28 Oct 2015 18:38:01 +0000 (UTC) From: Eduardo Habkost Date: Wed, 28 Oct 2015 16:36:59 -0200 Message-Id: <1446057425-16891-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1446057425-16891-1-git-send-email-ehabkost@redhat.com> References: <1446057425-16891-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 10/16] vl.c: Convert error sentences to simpler phrases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrew Jones , Markus Armbruster Simplify some error messages by making them simple phrases instead of full sentences. Suggested-by: Andrew Jones Signed-off-by: Eduardo Habkost --- vl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 67147e0..b8c6c3c 100644 --- a/vl.c +++ b/vl.c @@ -1066,7 +1066,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp) fd_opaque = qemu_opt_get(opts, "opaque"); if (fd < 0) { - error_report("fd option is required and must be non-negative"); + error_report("non-negative 'fd' option required"); return -1; } @@ -1081,12 +1081,12 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp) */ flags = fcntl(fd, F_GETFD); if (flags == -1 || (flags & FD_CLOEXEC)) { - error_report("fd is not valid or already in use"); + error_report("fd not valid or already in use"); return -1; } if (fdset_id < 0) { - error_report("set option is required and must be non-negative"); + error_report("non-negative 'set' option required"); return -1; } @@ -3751,7 +3751,7 @@ int main(int argc, char **argv, char **envp) option_rom[nb_option_roms].bootindex = qemu_opt_get_number(opts, "bootindex", -1); if (!option_rom[nb_option_roms].name) { - error_report("Option ROM file is not specified"); + error_report("option ROM file not specified"); exit(1); } nb_option_roms++; @@ -4225,11 +4225,11 @@ int main(int argc, char **argv, char **envp) } if ((no_frame || alt_grab || ctrl_grab) && display_type != DT_SDL) { - error_report("-no-frame, -alt-grab and -ctrl-grab are only valid " + error_report("-no-frame, -alt-grab and -ctrl-grab only valid " "for SDL, ignoring option"); } if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) { - error_report("-no-quit is only valid for GTK and SDL, " + error_report("-no-quit only valid for GTK and SDL, " "ignoring option"); } @@ -4373,7 +4373,7 @@ int main(int argc, char **argv, char **envp) cpu_ticks_init(); if (icount_opts) { if (kvm_enabled() || xen_enabled()) { - error_report("-icount is not allowed with kvm or xen"); + error_report("-icount not allowed with kvm or xen"); exit(1); } configure_icount(icount_opts, &error_abort); -- 2.1.0