OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qerror: qerror_table: don't use C99 struct initializers 

This allows for changing QERR_ macros to initialize two struct members
at the same time. See next commit for more details.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Luiz Capitulino 2012-07-27 13:58:30 -03:00
parent dcafd32348
commit 85465051e0
2 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
qerror.c
View File

@ -44,285 +44,285 @@ static const QType qerror_type = {
*/ */
static const QErrorStringTable qerror_table[] = { static const QErrorStringTable qerror_table[] = {
{ {
.error_fmt = QERR_ADD_CLIENT_FAILED, QERR_ADD_CLIENT_FAILED,
.desc = "Could not add client", "Could not add client",
}, },
{ {
.error_fmt = QERR_AMBIGUOUS_PATH, QERR_AMBIGUOUS_PATH,
.desc = "Path '%(path)' does not uniquely identify an object" "Path '%(path)' does not uniquely identify an object"
}, },
{ {
.error_fmt = QERR_BAD_BUS_FOR_DEVICE, QERR_BAD_BUS_FOR_DEVICE,
.desc = "Device '%(device)' can't go on a %(bad_bus_type) bus", "Device '%(device)' can't go on a %(bad_bus_type) bus",
}, },
{ {
.error_fmt = QERR_BASE_NOT_FOUND, QERR_BASE_NOT_FOUND,
.desc = "Base '%(base)' not found", "Base '%(base)' not found",
}, },
{ {
.error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
.desc = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'", "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",
}, },
{ {
.error_fmt = QERR_BUS_NO_HOTPLUG, QERR_BUS_NO_HOTPLUG,
.desc = "Bus '%(bus)' does not support hotplugging", "Bus '%(bus)' does not support hotplugging",
}, },
{ {
.error_fmt = QERR_BUS_NOT_FOUND, QERR_BUS_NOT_FOUND,
.desc = "Bus '%(bus)' not found", "Bus '%(bus)' not found",
}, },
{ {
.error_fmt = QERR_COMMAND_DISABLED, QERR_COMMAND_DISABLED,
.desc = "The command %(name) has been disabled for this instance", "The command %(name) has been disabled for this instance",
}, },
{ {
.error_fmt = QERR_COMMAND_NOT_FOUND, QERR_COMMAND_NOT_FOUND,
.desc = "The command %(name) has not been found", "The command %(name) has not been found",
}, },
{ {
.error_fmt = QERR_DEVICE_ENCRYPTED, QERR_DEVICE_ENCRYPTED,
.desc = "'%(device)' (%(filename)) is encrypted", "'%(device)' (%(filename)) is encrypted",
}, },
{ {
.error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,
.desc = "Migration is disabled when using feature '%(feature)' in device '%(device)'", "Migration is disabled when using feature '%(feature)' in device '%(device)'",
}, },
{ {
.error_fmt = QERR_DEVICE_HAS_NO_MEDIUM, QERR_DEVICE_HAS_NO_MEDIUM,
.desc = "Device '%(device)' has no medium", "Device '%(device)' has no medium",
}, },
{ {
.error_fmt = QERR_DEVICE_INIT_FAILED, QERR_DEVICE_INIT_FAILED,
.desc = "Device '%(device)' could not be initialized", "Device '%(device)' could not be initialized",
}, },
{ {
.error_fmt = QERR_DEVICE_IN_USE, QERR_DEVICE_IN_USE,
.desc = "Device '%(device)' is in use", "Device '%(device)' is in use",
}, },
{ {
.error_fmt = QERR_DEVICE_IS_READ_ONLY, QERR_DEVICE_IS_READ_ONLY,
.desc = "Device '%(device)' is read only", "Device '%(device)' is read only",
}, },
{ {
.error_fmt = QERR_DEVICE_LOCKED, QERR_DEVICE_LOCKED,
.desc = "Device '%(device)' is locked", "Device '%(device)' is locked",
}, },
{ {
.error_fmt = QERR_DEVICE_MULTIPLE_BUSSES, QERR_DEVICE_MULTIPLE_BUSSES,
.desc = "Device '%(device)' has multiple child busses", "Device '%(device)' has multiple child busses",
}, },
{ {
.error_fmt = QERR_DEVICE_NO_BUS, QERR_DEVICE_NO_BUS,
.desc = "Device '%(device)' has no child bus", "Device '%(device)' has no child bus",
}, },
{ {
.error_fmt = QERR_DEVICE_NO_HOTPLUG, QERR_DEVICE_NO_HOTPLUG,
.desc = "Device '%(device)' does not support hotplugging", "Device '%(device)' does not support hotplugging",
}, },
{ {
.error_fmt = QERR_DEVICE_NOT_ACTIVE, QERR_DEVICE_NOT_ACTIVE,
.desc = "Device '%(device)' has not been activated", "Device '%(device)' has not been activated",
}, },
{ {
.error_fmt = QERR_DEVICE_NOT_ENCRYPTED, QERR_DEVICE_NOT_ENCRYPTED,
.desc = "Device '%(device)' is not encrypted", "Device '%(device)' is not encrypted",
}, },
{ {
.error_fmt = QERR_DEVICE_NOT_FOUND, QERR_DEVICE_NOT_FOUND,
.desc = "Device '%(device)' not found", "Device '%(device)' not found",
}, },
{ {
.error_fmt = QERR_DEVICE_NOT_REMOVABLE, QERR_DEVICE_NOT_REMOVABLE,
.desc = "Device '%(device)' is not removable", "Device '%(device)' is not removable",
}, },
{ {
.error_fmt = QERR_DUPLICATE_ID, QERR_DUPLICATE_ID,
.desc = "Duplicate ID '%(id)' for %(object)", "Duplicate ID '%(id)' for %(object)",
}, },
{ {
.error_fmt = QERR_FD_NOT_FOUND, QERR_FD_NOT_FOUND,
.desc = "File descriptor named '%(name)' not found", "File descriptor named '%(name)' not found",
}, },
{ {
.error_fmt = QERR_FD_NOT_SUPPLIED, QERR_FD_NOT_SUPPLIED,
.desc = "No file descriptor supplied via SCM_RIGHTS", "No file descriptor supplied via SCM_RIGHTS",
}, },
{ {
.error_fmt = QERR_FEATURE_DISABLED, QERR_FEATURE_DISABLED,
.desc = "The feature '%(name)' is not enabled", "The feature '%(name)' is not enabled",
}, },
{ {
.error_fmt = QERR_INVALID_BLOCK_FORMAT, QERR_INVALID_BLOCK_FORMAT,
.desc = "Invalid block format '%(name)'", "Invalid block format '%(name)'",
}, },
{ {
.error_fmt = QERR_INVALID_OPTION_GROUP, QERR_INVALID_OPTION_GROUP,
.desc = "There is no option group '%(group)'", "There is no option group '%(group)'",
}, },
{ {
.error_fmt = QERR_INVALID_PARAMETER, QERR_INVALID_PARAMETER,
.desc = "Invalid parameter '%(name)'", "Invalid parameter '%(name)'",
}, },
{ {
.error_fmt = QERR_INVALID_PARAMETER_COMBINATION, QERR_INVALID_PARAMETER_COMBINATION,
.desc = "Invalid parameter combination", "Invalid parameter combination",
}, },
{ {
.error_fmt = QERR_INVALID_PARAMETER_TYPE, QERR_INVALID_PARAMETER_TYPE,
.desc = "Invalid parameter type for '%(name)', expected: %(expected)", "Invalid parameter type for '%(name)', expected: %(expected)",
}, },
{ {
.error_fmt = QERR_INVALID_PARAMETER_VALUE, QERR_INVALID_PARAMETER_VALUE,
.desc = "Parameter '%(name)' expects %(expected)", "Parameter '%(name)' expects %(expected)",
}, },
{ {
.error_fmt = QERR_INVALID_PASSWORD, QERR_INVALID_PASSWORD,
.desc = "Password incorrect", "Password incorrect",
}, },
{ {
.error_fmt = QERR_IO_ERROR, QERR_IO_ERROR,
.desc = "An IO error has occurred", "An IO error has occurred",
}, },
{ {
.error_fmt = QERR_JSON_PARSE_ERROR, QERR_JSON_PARSE_ERROR,
.desc = "JSON parse error, %(message)", "JSON parse error, %(message)",
}, },
{ {
.error_fmt = QERR_JSON_PARSING, QERR_JSON_PARSING,
.desc = "Invalid JSON syntax", "Invalid JSON syntax",
}, },
{ {
.error_fmt = QERR_KVM_MISSING_CAP, QERR_KVM_MISSING_CAP,
.desc = "Using KVM without %(capability), %(feature) unavailable", "Using KVM without %(capability), %(feature) unavailable",
}, },
{ {
.error_fmt = QERR_MIGRATION_ACTIVE, QERR_MIGRATION_ACTIVE,
.desc = "There's a migration process in progress", "There's a migration process in progress",
}, },
{ {
.error_fmt = QERR_MIGRATION_NOT_SUPPORTED, QERR_MIGRATION_NOT_SUPPORTED,
.desc = "State blocked by non-migratable device '%(device)'", "State blocked by non-migratable device '%(device)'",
}, },
{ {
.error_fmt = QERR_MIGRATION_EXPECTED, QERR_MIGRATION_EXPECTED,
.desc = "An incoming migration is expected before this command can be executed", "An incoming migration is expected before this command can be executed",
}, },
{ {
.error_fmt = QERR_MISSING_PARAMETER, QERR_MISSING_PARAMETER,
.desc = "Parameter '%(name)' is missing", "Parameter '%(name)' is missing",
}, },
{ {
.error_fmt = QERR_NO_BUS_FOR_DEVICE, QERR_NO_BUS_FOR_DEVICE,
.desc = "No '%(bus)' bus found for device '%(device)'", "No '%(bus)' bus found for device '%(device)'",
}, },
{ {
.error_fmt = QERR_NOT_SUPPORTED, QERR_NOT_SUPPORTED,
.desc = "Not supported", "Not supported",
}, },
{ {
.error_fmt = QERR_OPEN_FILE_FAILED, QERR_OPEN_FILE_FAILED,
.desc = "Could not open '%(filename)'", "Could not open '%(filename)'",
}, },
{ {
.error_fmt = QERR_PERMISSION_DENIED, QERR_PERMISSION_DENIED,
.desc = "Insufficient permission to perform this operation", "Insufficient permission to perform this operation",
}, },
{ {
.error_fmt = QERR_PROPERTY_NOT_FOUND, QERR_PROPERTY_NOT_FOUND,
.desc = "Property '%(device).%(property)' not found", "Property '%(device).%(property)' not found",
}, },
{ {
.error_fmt = QERR_PROPERTY_VALUE_BAD, QERR_PROPERTY_VALUE_BAD,
.desc = "Property '%(device).%(property)' doesn't take value '%(value)'", "Property '%(device).%(property)' doesn't take value '%(value)'",
}, },
{ {
.error_fmt = QERR_PROPERTY_VALUE_IN_USE, QERR_PROPERTY_VALUE_IN_USE,
.desc = "Property '%(device).%(property)' can't take value '%(value)', it's in use", "Property '%(device).%(property)' can't take value '%(value)', it's in use",
}, },
{ {
.error_fmt = QERR_PROPERTY_VALUE_NOT_FOUND, QERR_PROPERTY_VALUE_NOT_FOUND,
.desc = "Property '%(device).%(property)' can't find value '%(value)'", "Property '%(device).%(property)' can't find value '%(value)'",
}, },
{ {
.error_fmt = QERR_PROPERTY_VALUE_NOT_POWER_OF_2, QERR_PROPERTY_VALUE_NOT_POWER_OF_2,
.desc = "Property '%(device).%(property)' doesn't take " "Property '%(device).%(property)' doesn't take "
"value '%(value)', it's not a power of 2", "value '%(value)', it's not a power of 2",
}, },
{ {
.error_fmt = QERR_PROPERTY_VALUE_OUT_OF_RANGE, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
.desc = "Property '%(device).%(property)' doesn't take " "Property '%(device).%(property)' doesn't take "
"value %(value) (minimum: %(min), maximum: %(max))", "value %(value) (minimum: %(min), maximum: %(max))",
}, },
{ {
.error_fmt = QERR_QGA_COMMAND_FAILED, QERR_QGA_COMMAND_FAILED,
.desc = "Guest agent command failed, error was '%(message)'", "Guest agent command failed, error was '%(message)'",
}, },
{ {
.error_fmt = QERR_QGA_LOGGING_FAILED, QERR_QGA_LOGGING_FAILED,
.desc = "Guest agent failed to log non-optional log statement", "Guest agent failed to log non-optional log statement",
}, },
{ {
.error_fmt = QERR_QMP_BAD_INPUT_OBJECT, QERR_QMP_BAD_INPUT_OBJECT,
.desc = "Expected '%(expected)' in QMP input", "Expected '%(expected)' in QMP input",
}, },
{ {
.error_fmt = QERR_QMP_BAD_INPUT_OBJECT_MEMBER, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
.desc = "QMP input object member '%(member)' expects '%(expected)'", "QMP input object member '%(member)' expects '%(expected)'",
}, },
{ {
.error_fmt = QERR_QMP_EXTRA_MEMBER, QERR_QMP_EXTRA_MEMBER,
.desc = "QMP input object member '%(member)' is unexpected", "QMP input object member '%(member)' is unexpected",
}, },
{ {
.error_fmt = QERR_RESET_REQUIRED, QERR_RESET_REQUIRED,
.desc = "Resetting the Virtual Machine is required", "Resetting the Virtual Machine is required",
}, },
{ {
.error_fmt = QERR_SET_PASSWD_FAILED, QERR_SET_PASSWD_FAILED,
.desc = "Could not set password", "Could not set password",
}, },
{ {
.error_fmt = QERR_TOO_MANY_FILES, QERR_TOO_MANY_FILES,
.desc = "Too many open files", "Too many open files",
}, },
{ {
.error_fmt = QERR_UNDEFINED_ERROR, QERR_UNDEFINED_ERROR,
.desc = "An undefined error has occurred", "An undefined error has occurred",
}, },
{ {
.error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
.desc = "'%(device)' uses a %(format) feature which is not " "'%(device)' uses a %(format) feature which is not "
"supported by this qemu version: %(feature)", "supported by this qemu version: %(feature)",
}, },
{ {
.error_fmt = QERR_UNSUPPORTED, QERR_UNSUPPORTED,
.desc = "this feature or command is not currently supported", "this feature or command is not currently supported",
}, },
{ {
.error_fmt = QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
.desc = "Migration is disabled when VirtFS export path '%(path)' " "Migration is disabled when VirtFS export path '%(path)' "
"is mounted in the guest using mount_tag '%(tag)'", "is mounted in the guest using mount_tag '%(tag)'",
}, },
{ {
.error_fmt = QERR_VNC_SERVER_FAILED, QERR_VNC_SERVER_FAILED,
.desc = "Could not start VNC server on %(target)", "Could not start VNC server on %(target)",
}, },
{ {
.error_fmt = QERR_SOCKET_CONNECT_FAILED, QERR_SOCKET_CONNECT_FAILED,
.desc = "Failed to connect to socket", "Failed to connect to socket",
}, },
{ {
.error_fmt = QERR_SOCKET_LISTEN_FAILED, QERR_SOCKET_LISTEN_FAILED,
.desc = "Failed to set socket to listening mode", "Failed to set socket to listening mode",
}, },
{ {
.error_fmt = QERR_SOCKET_BIND_FAILED, QERR_SOCKET_BIND_FAILED,
.desc = "Failed to bind socket", "Failed to bind socket",
}, },
{ {
.error_fmt = QERR_SOCKET_CREATE_FAILED, QERR_SOCKET_CREATE_FAILED,
.desc = "Failed to create socket", "Failed to create socket",
}, },
{} {}
}; };

2
qerror.h
View File

@ -19,8 +19,8 @@
#include <stdarg.h> #include <stdarg.h>
typedef struct QErrorStringTable { typedef struct QErrorStringTable {
const char *desc;
const char *error_fmt; const char *error_fmt;
const char *desc;
} QErrorStringTable; } QErrorStringTable;
typedef struct QError { typedef struct QError {