Commit 7216ae3d authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-5-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 312fd5f2

util/qemu-option.c

+4 −0
Original line number Diff line number Diff line
@@ -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);