From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PULL 5/7] vl.c: Touch up error messages
Date: Tue, 3 Nov 2015 19:38:01 +0100 [thread overview]
Message-ID: <1446575883-24544-6-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>
Several small improvements:
* Use "cannot" instead of "can not"
* Use 'quotes' instead of `quotes'
* Change "fail to parse" error message to "failed to parse"
Suggested-by: Eric Blake <eblake@redhat.com>
Suggested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1446217682-24421-6-git-send-email-ehabkost@redhat.com>
[Squashed in
Message-Id: <1446217682-24421-7-git-send-email-ehabkost@redhat.com>
Message-Id: <1446217682-24421-9-git-send-email-ehabkost@redhat.com>
and updated commit message]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
vl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index 544dfe1..2d48e22 100644
--- a/vl.c
+++ b/vl.c
@@ -965,7 +965,7 @@ static struct bt_device_s *bt_device_add(const char *opt)
if (!strcmp(devname, "keyboard"))
return bt_keyboard_init(vlan);
- error_report("unsupported bluetooth device `%s'", devname);
+ error_report("unsupported bluetooth device '%s'", devname);
return 0;
}
@@ -3735,7 +3735,7 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_uuid:
if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
- error_report("fail to parse UUID string: wrong format");
+ error_report("failed to parse UUID string: wrong format");
exit(1);
}
qemu_uuid_set = true;
@@ -4166,12 +4166,12 @@ int main(int argc, char **argv, char **envp)
if (display_type == DT_NOGRAPHIC
&& (default_parallel || default_serial
|| default_monitor || default_virtcon)) {
- error_report("-nographic can not be used with -daemonize");
+ error_report("-nographic cannot be used with -daemonize");
exit(1);
}
#ifdef CONFIG_CURSES
if (display_type == DT_CURSES) {
- error_report("curses display can not be used with -daemonize");
+ error_report("curses display cannot be used with -daemonize");
exit(1);
}
#endif
@@ -4576,7 +4576,7 @@ int main(int argc, char **argv, char **envp)
vnc_init_func, NULL, NULL);
if (show_vnc_port) {
char *ret = vnc_display_local_addr("default");
- printf("VNC server running on `%s'\n", ret);
+ printf("VNC server running on '%s'\n", ret);
g_free(ret);
}
#endif
--
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 ` [Qemu-devel] [PULL 2/7] vl.c: Remove periods and exclamation points from error messages Markus Armbruster
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 ` Markus Armbruster [this message]
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-6-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).