diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-02-08 21:22:17 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-11 08:13:19 -0600 |
| commit | 7216ae3d1a11e07192623ad04d450e98bf1f3d10 (patch) | |
| tree | 0ae761f4b275d4d60970d947b170038a76e0701b | |
| parent | 312fd5f29097890179793d8bbb59ab18afbe0ad4 (diff) | |
qemu-option: Disable two helpful messages that got broken recently
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 <armbru@redhat.com>
Message-id: 1360354939-10994-5-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | util/qemu-option.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c index c12e7245ef..5a1d03c331 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); |