Commit c1303596 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Luiz Capitulino
Browse files

qerror: restore alphabetical order over qerrors 



Over time these must have gotten out of order.  Put everything back in
alphabetical order.

This is purely a clean up.  In practice nothing depends on the order.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 9737383b

qerror.c

+42 −42
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ static const QType qerror_type = { 
 * Use scripts/check-qerror.sh to check.

 */

static const QErrorStringTable qerror_table[] = {

    {

        .error_fmt = QERR_ADD_CLIENT_FAILED,

        .desc      = "Could not add client",

    },

    {

        .error_fmt = QERR_BAD_BUS_FOR_DEVICE,

        .desc      = "Device '%(device)' can't go on a %(bad_bus_type) bus",
@@ -51,26 +55,30 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,

        .desc      = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",

    },

    {

        .error_fmt = QERR_BUS_NOT_FOUND,

        .desc      = "Bus '%(bus)' not found",

    },

    {

        .error_fmt = QERR_BUS_NO_HOTPLUG,

        .desc      = "Bus '%(bus)' does not support hotplugging",

    },

    {

        .error_fmt = QERR_COMMAND_NOT_FOUND,

        .desc      = "The command %(name) has not been found",

        .error_fmt = QERR_BUS_NOT_FOUND,

        .desc      = "Bus '%(bus)' not found",

    },

    {

        .error_fmt = QERR_COMMAND_DISABLED,

        .desc      = "The command %(name) has been disabled for this instance",

    },

    {

        .error_fmt = QERR_COMMAND_NOT_FOUND,

        .desc      = "The command %(name) has not been found",

    },

    {

        .error_fmt = QERR_DEVICE_ENCRYPTED,

        .desc      = "Device '%(device)' is encrypted",

    },

    {

        .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,

        .desc      = "Migration is disabled when using feature '%(feature)' in device '%(device)'",

    },

    {

        .error_fmt = QERR_DEVICE_INIT_FAILED,

        .desc      = "Device '%(device)' could not be initialized",
@@ -79,10 +87,6 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_DEVICE_IN_USE,

        .desc      = "Device '%(device)' is in use",

    },

    {

        .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,

        .desc      = "Migration is disabled when using feature '%(feature)' in device '%(device)'",

    },

    {

        .error_fmt = QERR_DEVICE_LOCKED,

        .desc      = "Device '%(device)' is locked",
@@ -91,6 +95,14 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_DEVICE_MULTIPLE_BUSSES,

        .desc      = "Device '%(device)' has multiple child busses",

    },

    {

        .error_fmt = QERR_DEVICE_NO_BUS,

        .desc      = "Device '%(device)' has no child bus",

    },

    {

        .error_fmt = QERR_DEVICE_NO_HOTPLUG,

        .desc      = "Device '%(device)' does not support hotplugging",

    },

    {

        .error_fmt = QERR_DEVICE_NOT_ACTIVE,

        .desc      = "Device '%(device)' has not been activated",
@@ -107,14 +119,6 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_DEVICE_NOT_REMOVABLE,

        .desc      = "Device '%(device)' is not removable",

    },

    {

        .error_fmt = QERR_DEVICE_NO_BUS,

        .desc      = "Device '%(device)' has no child bus",

    },

    {

        .error_fmt = QERR_DEVICE_NO_HOTPLUG,

        .desc      = "Device '%(device)' does not support hotplugging",

    },

    {

        .error_fmt = QERR_DUPLICATE_ID,

        .desc      = "Duplicate ID '%(id)' for %(object)",
@@ -139,6 +143,10 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_INVALID_PARAMETER,

        .desc      = "Invalid parameter '%(name)'",

    },

    {

        .error_fmt = QERR_INVALID_PARAMETER_COMBINATION,

        .desc      = "Invalid parameter combination",

    },

    {

        .error_fmt = QERR_INVALID_PARAMETER_TYPE,

        .desc      = "Invalid parameter type, expected: %(expected)",
@@ -155,15 +163,15 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_IO_ERROR,

        .desc      = "An IO error has occurred",

    },

    {

        .error_fmt = QERR_JSON_PARSING,

        .desc      = "Invalid JSON syntax",

    },

    {

        .error_fmt = QERR_JSON_PARSE_ERROR,

        .desc      = "JSON parse error, %(message)",



    },

    {

        .error_fmt = QERR_JSON_PARSING,

        .desc      = "Invalid JSON syntax",

    },

    {

        .error_fmt = QERR_KVM_MISSING_CAP,

        .desc      = "Using KVM without %(capability), %(feature) unavailable",
@@ -209,6 +217,14 @@ static const QErrorStringTable qerror_table[] = { 
        .desc      = "Property '%(device).%(property)' doesn't take "

                     "value %(value) (minimum: %(min), maximum: %(max)'",

    },

    {

        .error_fmt = QERR_QGA_COMMAND_FAILED,

        .desc      = "Guest agent command failed, error was '%(message)'",

    },

    {

        .error_fmt = QERR_QGA_LOGGING_FAILED,

        .desc      = "Guest agent failed to log non-optional log statement",

    },

    {

        .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,

        .desc      = "Expected '%(expected)' in QMP input",
@@ -229,10 +245,6 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_SET_PASSWD_FAILED,

        .desc      = "Could not set password",

    },

    {

        .error_fmt = QERR_ADD_CLIENT_FAILED,

        .desc      = "Could not add client",

    },

    {

        .error_fmt = QERR_TOO_MANY_FILES,

        .desc      = "Too many open files",
@@ -241,15 +253,15 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_UNDEFINED_ERROR,

        .desc      = "An undefined error has occurred",

    },

    {

        .error_fmt = QERR_UNSUPPORTED,

        .desc      = "this feature or command is not currently supported",

    },

    {

        .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,

        .desc      = "'%(device)' uses a %(format) feature which is not "

                     "supported by this qemu version: %(feature)",

    },

    {

        .error_fmt = QERR_UNSUPPORTED,

        .desc      = "this feature or command is not currently supported",

    },

    {

        .error_fmt = QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,

        .desc      = "Migration is disabled when VirtFS export path '%(path)' "
@@ -259,18 +271,6 @@ static const QErrorStringTable qerror_table[] = { 
        .error_fmt = QERR_VNC_SERVER_FAILED,

        .desc      = "Could not start VNC server on %(target)",

    },

    {

        .error_fmt = QERR_QGA_LOGGING_FAILED,

        .desc      = "Guest agent failed to log non-optional log statement",

    },

    {

        .error_fmt = QERR_QGA_COMMAND_FAILED,

        .desc      = "Guest agent command failed, error was '%(message)'",

    },

    {

        .error_fmt = QERR_INVALID_PARAMETER_COMBINATION,

        .desc      = "Invalid parameter combination",

    },

    {}

};

qerror.h

+36 −36
Original line number Diff line number Diff line
@@ -51,42 +51,54 @@ QError *qobject_to_qerror(const QObject *obj); 
 * Please keep the definitions in alphabetical order.

 * Use scripts/check-qerror.sh to check.

 */

#define QERR_ADD_CLIENT_FAILED \

    "{ 'class': 'AddClientFailed', 'data': {} }"



#define QERR_BAD_BUS_FOR_DEVICE \

    "{ 'class': 'BadBusForDevice', 'data': { 'device': %s, 'bad_bus_type': %s } }"



#define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \

    "{ 'class': 'BlockFormatFeatureNotSupported', 'data': { 'format': %s, 'name': %s, 'feature': %s } }"



#define QERR_BUS_NOT_FOUND \

    "{ 'class': 'BusNotFound', 'data': { 'bus': %s } }"

#define QERR_BUFFER_OVERRUN \

    "{ 'class': 'BufferOverrun', 'data': {} }"



#define QERR_BUS_NO_HOTPLUG \

    "{ 'class': 'BusNoHotplug', 'data': { 'bus': %s } }"



#define QERR_COMMAND_NOT_FOUND \

    "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"

#define QERR_BUS_NOT_FOUND \

    "{ 'class': 'BusNotFound', 'data': { 'bus': %s } }"



#define QERR_COMMAND_DISABLED \

    "{ 'class': 'CommandDisabled', 'data': { 'name': %s } }"



#define QERR_COMMAND_NOT_FOUND \

    "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"



#define QERR_DEVICE_ENCRYPTED \

    "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s, 'filename': %s } }"



#define QERR_DEVICE_FEATURE_BLOCKS_MIGRATION \

    "{ 'class': 'DeviceFeatureBlocksMigration', 'data': { 'device': %s, 'feature': %s } }"



#define QERR_DEVICE_INIT_FAILED \

    "{ 'class': 'DeviceInitFailed', 'data': { 'device': %s } }"



#define QERR_DEVICE_IN_USE \

    "{ 'class': 'DeviceInUse', 'data': { 'device': %s } }"



#define QERR_DEVICE_FEATURE_BLOCKS_MIGRATION \

    "{ 'class': 'DeviceFeatureBlocksMigration', 'data': { 'device': %s, 'feature': %s } }"



#define QERR_DEVICE_LOCKED \

    "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"



#define QERR_DEVICE_MULTIPLE_BUSSES \

    "{ 'class': 'DeviceMultipleBusses', 'data': { 'device': %s } }"



#define QERR_DEVICE_NO_BUS \

    "{ 'class': 'DeviceNoBus', 'data': { 'device': %s } }"



#define QERR_DEVICE_NO_HOTPLUG \

    "{ 'class': 'DeviceNoHotplug', 'data': { 'device': %s } }"



#define QERR_DEVICE_NOT_ACTIVE \

    "{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"
@@ -99,12 +111,6 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_DEVICE_NOT_REMOVABLE \

    "{ 'class': 'DeviceNotRemovable', 'data': { 'device': %s } }"



#define QERR_DEVICE_NO_BUS \

    "{ 'class': 'DeviceNoBus', 'data': { 'device': %s } }"



#define QERR_DEVICE_NO_HOTPLUG \

    "{ 'class': 'DeviceNoHotplug', 'data': { 'device': %s } }"



#define QERR_DUPLICATE_ID \

    "{ 'class': 'DuplicateId', 'data': { 'id': %s, 'object': %s } }"
@@ -114,12 +120,18 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_FD_NOT_SUPPLIED \

    "{ 'class': 'FdNotSupplied', 'data': {} }"



#define QERR_FEATURE_DISABLED \

    "{ 'class': 'FeatureDisabled', 'data': { 'name': %s } }"



#define QERR_INVALID_BLOCK_FORMAT \

    "{ 'class': 'InvalidBlockFormat', 'data': { 'name': %s } }"



#define QERR_INVALID_PARAMETER \

    "{ 'class': 'InvalidParameter', 'data': { 'name': %s } }"



#define QERR_INVALID_PARAMETER_COMBINATION \

    "{ 'class': 'InvalidParameterCombination', 'data': {} }"



#define QERR_INVALID_PARAMETER_TYPE \

    "{ 'class': 'InvalidParameterType', 'data': { 'name': %s,'expected': %s } }"
@@ -132,14 +144,11 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_IO_ERROR \

    "{ 'class': 'IOError', 'data': {} }"



#define QERR_JSON_PARSING \

    "{ 'class': 'JSONParsing', 'data': {} }"



#define QERR_JSON_PARSE_ERROR \

    "{ 'class': 'JSONParseError', 'data': { 'message': %s } }"



#define QERR_BUFFER_OVERRUN \

    "{ 'class': 'BufferOverrun', 'data': {} }"

#define QERR_JSON_PARSING \

    "{ 'class': 'JSONParsing', 'data': {} }"



#define QERR_KVM_MISSING_CAP \

    "{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }"
@@ -174,6 +183,12 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \

    "{ 'class': 'PropertyValueOutOfRange', 'data': { 'device': %s, 'property': %s, 'value': %"PRId64", 'min': %"PRId64", 'max': %"PRId64" } }"



#define QERR_QGA_COMMAND_FAILED \

    "{ 'class': 'QgaCommandFailed', 'data': { 'message': %s } }"



#define QERR_QGA_LOGGING_FAILED \

    "{ 'class': 'QgaLoggingFailed', 'data': {} }"



#define QERR_QMP_BAD_INPUT_OBJECT \

    "{ 'class': 'QMPBadInputObject', 'data': { 'expected': %s } }"
@@ -189,37 +204,22 @@ QError *qobject_to_qerror(const QObject *obj); 
#define QERR_SET_PASSWD_FAILED \

    "{ 'class': 'SetPasswdFailed', 'data': {} }"



#define QERR_ADD_CLIENT_FAILED \

    "{ 'class': 'AddClientFailed', 'data': {} }"



#define QERR_TOO_MANY_FILES \

    "{ 'class': 'TooManyFiles', 'data': {} }"



#define QERR_UNDEFINED_ERROR \

    "{ 'class': 'UndefinedError', 'data': {} }"



#define QERR_UNSUPPORTED \

    "{ 'class': 'Unsupported', 'data': {} }"



#define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \

    "{ 'class': 'UnknownBlockFormatFeature', 'data': { 'device': %s, 'format': %s, 'feature': %s } }"



#define QERR_UNSUPPORTED \

    "{ 'class': 'Unsupported', 'data': {} }"



#define QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION \

    "{ 'class': 'VirtFSFeatureBlocksMigration', 'data': { 'path': %s, 'tag': %s } }"



#define QERR_VNC_SERVER_FAILED \

    "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }"



#define QERR_FEATURE_DISABLED \

    "{ 'class': 'FeatureDisabled', 'data': { 'name': %s } }"



#define QERR_QGA_LOGGING_FAILED \

    "{ 'class': 'QgaLoggingFailed', 'data': {} }"



#define QERR_QGA_COMMAND_FAILED \

    "{ 'class': 'QgaCommandFailed', 'data': { 'message': %s } }"



#define QERR_INVALID_PARAMETER_COMBINATION \

    "{ 'class': 'InvalidParameterCombination', 'data': {} }"



#endif /* QERROR_H */