mirror of
https://github.com/qemu/qemu.git
synced 2025-07-29 06:26:06 +00:00
84a56f38b2
The callback to consume JSON values takes QObject *json, Error *err. If both are null, the callback is supposed to make up an error by itself. This sucks. qjson.c's consume_json() neglects to do so, which makes qobject_from_json() null instead of failing. I consider that a bug. The culprit is json_message_process_token(): it passes two null pointers when it runs into a lexical error or a limit violation. Fix it to pass a proper Error object then. Update the callbacks: * monitor.c's handle_qmp_command(): the code to make up an error is now dead, drop it. * qga/main.c's process_event(): lumps the "both null" case together with the "not a JSON object" case. The former is now gone. The error message "Invalid JSON syntax" is misleading for the latter. Improve it to "Input must be a JSON object". * qobject/qjson.c's consume_json(): no update; check-qjson demonstrates qobject_from_json() now sets an error on lexical errors, but still doesn't on some other errors. * tests/libqtest.c's qmp_response(): the Error object is now reliable, so use it to improve the error message. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180823164025.12553-40-armbru@redhat.com>
95 lines
2.3 KiB
C
95 lines
2.3 KiB
C
/*
|
|
* QError Module
|
|
*
|
|
* Copyright (C) 2009 Red Hat Inc.
|
|
*
|
|
* Authors:
|
|
* Luiz Capitulino <lcapitulino@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*/
|
|
#ifndef QERROR_H
|
|
#define QERROR_H
|
|
|
|
/*
|
|
* These macros will go away, please don't use in new code, and do not
|
|
* add new ones!
|
|
*/
|
|
#define QERR_BASE_NOT_FOUND \
|
|
"Base '%s' not found"
|
|
|
|
#define QERR_BUS_NO_HOTPLUG \
|
|
"Bus '%s' does not support hotplugging"
|
|
|
|
#define QERR_DEVICE_HAS_NO_MEDIUM \
|
|
"Device '%s' has no medium"
|
|
|
|
#define QERR_DEVICE_INIT_FAILED \
|
|
"Device '%s' could not be initialized"
|
|
|
|
#define QERR_DEVICE_IN_USE \
|
|
"Device '%s' is in use"
|
|
|
|
#define QERR_DEVICE_NO_HOTPLUG \
|
|
"Device '%s' does not support hotplugging"
|
|
|
|
#define QERR_FD_NOT_FOUND \
|
|
"File descriptor named '%s' not found"
|
|
|
|
#define QERR_FD_NOT_SUPPLIED \
|
|
"No file descriptor supplied via SCM_RIGHTS"
|
|
|
|
#define QERR_FEATURE_DISABLED \
|
|
"The feature '%s' is not enabled"
|
|
|
|
#define QERR_INVALID_BLOCK_FORMAT \
|
|
"Invalid block format '%s'"
|
|
|
|
#define QERR_INVALID_PARAMETER \
|
|
"Invalid parameter '%s'"
|
|
|
|
#define QERR_INVALID_PARAMETER_TYPE \
|
|
"Invalid parameter type for '%s', expected: %s"
|
|
|
|
#define QERR_INVALID_PARAMETER_VALUE \
|
|
"Parameter '%s' expects %s"
|
|
|
|
#define QERR_INVALID_PASSWORD \
|
|
"Password incorrect"
|
|
|
|
#define QERR_IO_ERROR \
|
|
"An IO error has occurred"
|
|
|
|
#define QERR_MIGRATION_ACTIVE \
|
|
"There's a migration process in progress"
|
|
|
|
#define QERR_MISSING_PARAMETER \
|
|
"Parameter '%s' is missing"
|
|
|
|
#define QERR_PERMISSION_DENIED \
|
|
"Insufficient permission to perform this operation"
|
|
|
|
#define QERR_PROPERTY_VALUE_BAD \
|
|
"Property '%s.%s' doesn't take value '%s'"
|
|
|
|
#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \
|
|
"Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")"
|
|
|
|
#define QERR_QGA_COMMAND_FAILED \
|
|
"Guest agent command failed, error was '%s'"
|
|
|
|
#define QERR_SET_PASSWD_FAILED \
|
|
"Could not set password"
|
|
|
|
#define QERR_UNDEFINED_ERROR \
|
|
"An undefined error has occurred"
|
|
|
|
#define QERR_UNSUPPORTED \
|
|
"this feature or command is not currently supported"
|
|
|
|
#define QERR_REPLAY_NOT_SUPPORTED \
|
|
"Record/replay feature is not supported for '%s'"
|
|
|
|
#endif /* QERROR_H */
|