[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.4 4/6] qemu-option: Disable two helpful messag
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-1.4 4/6] qemu-option: Disable two helpful messages that got broken recently |
Date: |
Fri, 8 Feb 2013 13:15:47 +0100 |
commit 8be7e7e4 and commit ec7b2ccb messed up the ordering of error
message and the helpful explanation that should follow it, like this:
$ qemu-system-x86_64 --nodefaults -S --vnc :0 --chardev null,id=,
Identifiers consist of letters, digits, '-', '.', '_', starting with a
letter.
qemu-system-x86_64: -chardev null,id=,: Parameter 'id' expects an identifier
$ qemu-system-x86_64 --nodefaults -S --vnc :0 --machine kvm_shadow_mem=dunno
You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and
terabytes.
qemu-system-x86_64: -machine kvm_shadow_mem=dunno: Parameter
'kvm_shadow_mem' expects a size
Pity. Disable them for now.
Signed-off-by: Markus Armbruster <address@hidden>
---
util/qemu-option.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index c12e724..5a1d03c 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -231,8 +231,10 @@ static void parse_option_size(const char *name, const char
*value,
break;
default:
error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
+#if 0 /* conversion from qerror_report() to error_set() broke this: */
error_printf_unless_qmp("You may use k, M, G or T suffixes for "
"kilobytes, megabytes, gigabytes and terabytes.\n");
+#endif
return;
}
} else {
@@ -771,7 +773,9 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char
*id,
if (id) {
if (!id_wellformed(id)) {
error_set(errp,QERR_INVALID_PARAMETER_VALUE, "id", "an
identifier");
+#if 0 /* conversion from qerror_report() to error_set() broke this: */
error_printf_unless_qmp("Identifiers consist of letters, digits,
'-', '.', '_', starting with a letter.\n");
+#endif
return NULL;
}
opts = qemu_opts_find(list, id);
--
1.7.11.7
- [Qemu-devel] [PATCH for-1.4 0/6] Error reporting fixes, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 2/6] error: Clean up abuse of error_report() for help, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 1/6] error: Clean up error strings with embedded newlines, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 4/6] qemu-option: Disable two helpful messages that got broken recently,
Markus Armbruster <=
- [Qemu-devel] [PATCH for-1.4 5/6] vl: Drop redundant "parse error" reports, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 6/6] vl: Exit unsuccessfully on option argument syntax error, Markus Armbruster, 2013/02/08
- [Qemu-devel] [PATCH for-1.4 3/6] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2013/02/08