From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PULL 2/7] vl.c: Remove periods and exclamation points from error messages
Date: Tue, 3 Nov 2015 19:37:58 +0100 [thread overview]
Message-ID: <1446575883-24544-3-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1446575883-24544-1-git-send-email-armbru@redhat.com>
From: Eduardo Habkost <ehabkost@redhat.com>
Except for removing periods and exclamation points, no other changes
were made to the error messages (yet).
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1446217682-24421-4-git-send-email-ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
vl.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/vl.c b/vl.c
index 447cb9a..ec677de 100644
--- a/vl.c
+++ b/vl.c
@@ -906,7 +906,7 @@ static int bt_hci_parse(const char *str)
bdaddr_t bdaddr;
if (nb_hcis >= MAX_NICS) {
- error_report("Too many bluetooth HCIs (max %i).", MAX_NICS);
+ error_report("Too many bluetooth HCIs (max %i)", MAX_NICS);
return -1;
}
@@ -2279,7 +2279,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
}
if (strncmp(name, "opt/", 4) != 0) {
error_report("WARNING: externally provided fw_cfg item names "
- "should be prefixed with \"opt/\"!");
+ "should be prefixed with \"opt/\"");
}
if (nonempty_str(str)) {
size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
@@ -2637,7 +2637,7 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b)
}
if (name && !is_help_option(name)) {
error_report("Unsupported machine type");
- error_printf("Use -machine help to list supported machines!\n");
+ error_printf("Use -machine help to list supported machines\n");
} else {
printf("Supported machines are:\n");
machines = g_slist_sort(machines, machine_class_cmp);
@@ -3441,7 +3441,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 is not supported by this qemu build");
exit(1);
}
opts = qemu_opts_parse_noisily(olist, optarg, true);
@@ -3456,7 +3456,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 is not supported by this qemu build");
exit(1);
}
opts = qemu_opts_parse_noisily(olist, optarg, true);
@@ -3466,7 +3466,7 @@ int main(int argc, char **argv, char **envp)
if (qemu_opt_get(opts, "fsdriver") == NULL ||
qemu_opt_get(opts, "mount_tag") == NULL) {
- error_report("Usage: -virtfs fsdriver,mount_tag=tag.");
+ error_report("Usage: -virtfs fsdriver,mount_tag=tag");
exit(1);
}
fsdev = qemu_opts_create(qemu_find_opts("fsdev"),
@@ -3658,7 +3658,7 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_no_kvm_pit: {
error_report("Warning: KVM PIT can no longer be disabled "
- "separately.");
+ "separately");
break;
}
case QEMU_OPTION_no_kvm_pit_reinjection: {
@@ -3672,7 +3672,7 @@ int main(int argc, char **argv, char **envp)
};
error_report("Warning: option deprecated, use "
- "lost_tick_policy property of kvm-pit instead.");
+ "lost_tick_policy property of kvm-pit instead");
qdev_prop_register_global_list(kvm_pit_lost_tick_policy);
break;
}
@@ -3736,7 +3736,7 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_uuid:
if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
error_report("Fail to parse UUID string."
- " Wrong format.");
+ " Wrong format");
exit(1);
}
qemu_uuid_set = true;
@@ -3798,7 +3798,7 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_tdf:
error_report("Warning: user space PIT time drift fix "
- "is no longer supported.");
+ "is no longer supported");
break;
case QEMU_OPTION_name:
opts = qemu_opts_parse_noisily(qemu_find_opts("name"),
@@ -3901,7 +3901,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 is not supported by this qemu build");
exit(1);
}
opts = qemu_opts_parse_noisily(olist, optarg, false);
@@ -4003,8 +4003,8 @@ int main(int argc, char **argv, char **envp)
}
if (machine_class == NULL) {
- error_report("No machine specified, and there is no default.");
- error_printf("Use -machine help to list supported machines!\n");
+ error_report("No machine specified, and there is no default");
+ error_printf("Use -machine help to list supported machines\n");
exit(1);
}
@@ -4252,9 +4252,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 is not supported by the display");
#else
- error_report("QEMU was built without opengl support.");
+ error_report("QEMU was built without opengl support");
#endif
exit(1);
}
--
2.4.3
next prev parent reply other threads:[~2015-11-03 18:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 18:37 [Qemu-devel] [PULL 0/7] vl.c: Error message rework Markus Armbruster
2015-11-03 18:37 ` [Qemu-devel] [PULL 1/7] vl.c: Replace fprintf(stderr) with error_report() Markus Armbruster
2015-11-03 18:37 ` Markus Armbruster [this message]
2015-11-03 18:37 ` [Qemu-devel] [PULL 3/7] vl.c: Use "warning:" prefix consistently on warnings Markus Armbruster
2015-11-03 18:38 ` [Qemu-devel] [PULL 4/7] vl.c: Remove unnecessary uppercase in error messages Markus Armbruster
2015-11-03 18:38 ` [Qemu-devel] [PULL 5/7] vl.c: Touch up " Markus Armbruster
2015-11-03 18:38 ` [Qemu-devel] [PULL 6/7] vl.c: Improve warnings on use of deprecated options Markus Armbruster
2015-11-03 18:38 ` [Qemu-devel] [PULL 7/7] vl.c: Use "%s support is disabled" error messages consistently Markus Armbruster
2015-11-05 10:10 ` [Qemu-devel] [PULL 0/7] vl.c: Error message rework Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446575883-24544-3-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).