From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrVbc-00037w-TP for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrVbb-0004gf-Fl for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:37:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrVbb-0004g0-8S for qemu-devel@nongnu.org; Wed, 28 Oct 2015 14:37:51 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id F16D28F29C for ; Wed, 28 Oct 2015 18:37:50 +0000 (UTC) From: Eduardo Habkost Date: Wed, 28 Oct 2015 16:36:56 -0200 Message-Id: <1446057425-16891-8-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 07/16] vl.c: Use "%s support disabled" error messages consistently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrew Jones , Markus Armbruster Signed-off-by: Eduardo Habkost --- vl.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/vl.c b/vl.c index d417dd9..f37e3a9 100644 --- a/vl.c +++ b/vl.c @@ -1018,8 +1018,7 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp) return -1; } #else - error_report("sandboxing request but seccomp is not compiled " - "into this build"); + error_report("seccomp support disabled"); return -1; #endif } @@ -2112,7 +2111,7 @@ static DisplayType select_display(const char *p) opts = nextopt; } #else - error_report("SDL support is disabled"); + error_report("SDL support disabled"); exit(1); #endif } else if (strstart(p, "vnc", &opts)) { @@ -2128,14 +2127,14 @@ static DisplayType select_display(const char *p) exit(1); } #else - error_report("VNC support is disabled"); + error_report("VNC support disabled"); exit(1); #endif } else if (strstart(p, "curses", &opts)) { #ifdef CONFIG_CURSES display = DT_CURSES; #else - error_report("Curses support is disabled"); + error_report("curses support disabled"); exit(1); #endif } else if (strstart(p, "gtk", &opts)) { @@ -2170,7 +2169,7 @@ static DisplayType select_display(const char *p) opts = nextopt; } #else - error_report("GTK support is disabled"); + error_report("GTK support disabled"); exit(1); #endif } else if (strstart(p, "none", &opts)) { @@ -2635,7 +2634,7 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) return mc; } if (name && !is_help_option(name)) { - error_report("Unsupported machine type"); + error_report("unsupported machine type"); error_printf("Use -machine help to list supported machines!\n"); } else { printf("Supported machines are:\n"); @@ -3011,7 +3010,7 @@ int main(int argc, char **argv, char **envp) runstate_init(); if (qcrypto_init(&err) < 0) { - error_report("Cannot initialize crypto: %s", error_get_pretty(err)); + error_report("cannot initialize crypto: %s", error_get_pretty(err)); exit(1); } rtc_clock = QEMU_CLOCK_HOST; @@ -3212,7 +3211,7 @@ int main(int argc, char **argv, char **envp) #ifdef CONFIG_CURSES display_type = DT_CURSES; #else - error_report("Curses support is disabled"); + error_report("curses support disabled"); exit(1); #endif break; @@ -3440,7 +3439,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_fsdev: olist = qemu_find_opts("fsdev"); if (!olist) { - error_report("fsdev is not supported by this qemu build"); + error_report("fsdev support disabled"); exit(1); } opts = qemu_opts_parse_noisily(olist, optarg, true); @@ -3455,7 +3454,7 @@ int main(int argc, char **argv, char **envp) olist = qemu_find_opts("virtfs"); if (!olist) { - error_report("virtfs is not supported by this qemu build"); + error_report("virtfs support disabled"); exit(1); } opts = qemu_opts_parse_noisily(olist, optarg, true); @@ -3593,7 +3592,7 @@ int main(int argc, char **argv, char **envp) display_type = DT_SDL; break; #else - error_report("SDL support is disabled"); + error_report("SDL support disabled"); exit(1); #endif case QEMU_OPTION_pidfile: @@ -3705,7 +3704,7 @@ int main(int argc, char **argv, char **envp) exit(1); } #else - error_report("VNC support is disabled"); + error_report("VNC support disabled"); exit(1); #endif break; @@ -3899,7 +3898,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_spice: olist = qemu_find_opts("spice"); if (!olist) { - error_report("spice is not supported by this qemu build"); + error_report("spice support disabled"); exit(1); } opts = qemu_opts_parse_noisily(olist, optarg, false); @@ -3947,8 +3946,7 @@ int main(int argc, char **argv, char **envp) exit(1); } #else - error_report("File descriptor passing is disabled on this " - "platform"); + error_report("fd passing disabled on this platform"); exit(1); #endif break; @@ -4249,9 +4247,9 @@ int main(int argc, char **argv, char **envp) #endif if (request_opengl == 1 && display_opengl == 0) { #if defined(CONFIG_OPENGL) - error_report("OpenGL is not supported by the display"); + error_report("OpenGL not supported by the display"); #else - error_report("QEMU was built without opengl support"); + error_report("OpenGL support disabled"); #endif exit(1); } -- 2.1.0