From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com,
eblake@redhat.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 21/27] qerror: qerror_table: don't use C99 struct initializers
Date: Fri, 27 Jul 2012 18:32:02 -0300 [thread overview]
Message-ID: <1343424728-22461-22-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1343424728-22461-1-git-send-email-lcapitulino@redhat.com>
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>
---
qerror.c | 280 +++++++++++++++++++++++++++++++--------------------------------
qerror.h | 2 +-
2 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/qerror.c b/qerror.c
index 691d8a8..cdaaf17 100644
--- a/qerror.c
+++ b/qerror.c
@@ -44,289 +44,289 @@ static const QType qerror_type = {
*/
static const QErrorStringTable qerror_table[] = {
{
- .error_fmt = QERR_ADD_CLIENT_FAILED,
- .desc = "Could not add client",
+ QERR_ADD_CLIENT_FAILED,
+ "Could not add client",
},
{
- .error_fmt = QERR_AMBIGUOUS_PATH,
- .desc = "Path '%(path)' does not uniquely identify an object"
+ QERR_AMBIGUOUS_PATH,
+ "Path '%(path)' does not uniquely identify an object"
},
{
- .error_fmt = QERR_BAD_BUS_FOR_DEVICE,
- .desc = "Device '%(device)' can't go on a %(bad_bus_type) bus",
+ QERR_BAD_BUS_FOR_DEVICE,
+ "Device '%(device)' can't go on a %(bad_bus_type) bus",
},
{
- .error_fmt = QERR_BASE_NOT_FOUND,
- .desc = "Base '%(base)' not found",
+ QERR_BASE_NOT_FOUND,
+ "Base '%(base)' not found",
},
{
- .error_fmt = QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
- .desc = "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",
+ QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
+ "Block format '%(format)' used by device '%(name)' does not support feature '%(feature)'",
},
{
- .error_fmt = QERR_BUS_NO_HOTPLUG,
- .desc = "Bus '%(bus)' does not support hotplugging",
+ QERR_BUS_NO_HOTPLUG,
+ "Bus '%(bus)' does not support hotplugging",
},
{
- .error_fmt = QERR_BUS_NOT_FOUND,
- .desc = "Bus '%(bus)' not found",
+ QERR_BUS_NOT_FOUND,
+ "Bus '%(bus)' not found",
},
{
- .error_fmt = QERR_COMMAND_DISABLED,
- .desc = "The command %(name) has been disabled for this instance",
+ QERR_COMMAND_DISABLED,
+ "The command %(name) has been disabled for this instance",
},
{
- .error_fmt = QERR_COMMAND_NOT_FOUND,
- .desc = "The command %(name) has not been found",
+ QERR_COMMAND_NOT_FOUND,
+ "The command %(name) has not been found",
},
{
- .error_fmt = QERR_DEVICE_ENCRYPTED,
- .desc = "Device '%(device)' is encrypted (filename is '%(filename)')",
+ QERR_DEVICE_ENCRYPTED,
+ "Device '%(device)' is encrypted (filename is '%(filename)')",
},
{
- .error_fmt = QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,
- .desc = "Migration is disabled when using feature '%(feature)' in device '%(device)'",
+ QERR_DEVICE_FEATURE_BLOCKS_MIGRATION,
+ "Migration is disabled when using feature '%(feature)' in device '%(device)'",
},
{
- .error_fmt = QERR_DEVICE_HAS_NO_MEDIUM,
- .desc = "Device '%(device)' has no medium",
+ QERR_DEVICE_HAS_NO_MEDIUM,
+ "Device '%(device)' has no medium",
},
{
- .error_fmt = QERR_DEVICE_INIT_FAILED,
- .desc = "Device '%(device)' could not be initialized",
+ QERR_DEVICE_INIT_FAILED,
+ "Device '%(device)' could not be initialized",
},
{
- .error_fmt = QERR_DEVICE_IN_USE,
- .desc = "Device '%(device)' is in use",
+ QERR_DEVICE_IN_USE,
+ "Device '%(device)' is in use",
},
{
- .error_fmt = QERR_DEVICE_IS_READ_ONLY,
- .desc = "Device '%(device)' is read only",
+ QERR_DEVICE_IS_READ_ONLY,
+ "Device '%(device)' is read only",
},
{
- .error_fmt = QERR_DEVICE_LOCKED,
- .desc = "Device '%(device)' is locked",
+ QERR_DEVICE_LOCKED,
+ "Device '%(device)' is locked",
},
{
- .error_fmt = QERR_DEVICE_MULTIPLE_BUSSES,
- .desc = "Device '%(device)' has multiple child busses",
+ QERR_DEVICE_MULTIPLE_BUSSES,
+ "Device '%(device)' has multiple child busses",
},
{
- .error_fmt = QERR_DEVICE_NO_BUS,
- .desc = "Device '%(device)' has no child bus",
+ QERR_DEVICE_NO_BUS,
+ "Device '%(device)' has no child bus",
},
{
- .error_fmt = QERR_DEVICE_NO_HOTPLUG,
- .desc = "Device '%(device)' does not support hotplugging",
+ QERR_DEVICE_NO_HOTPLUG,
+ "Device '%(device)' does not support hotplugging",
},
{
- .error_fmt = QERR_DEVICE_NOT_ACTIVE,
- .desc = "Device '%(device)' has not been activated",
+ QERR_DEVICE_NOT_ACTIVE,
+ "Device '%(device)' has not been activated",
},
{
- .error_fmt = QERR_DEVICE_NOT_ENCRYPTED,
- .desc = "Device '%(device)' is not encrypted",
+ QERR_DEVICE_NOT_ENCRYPTED,
+ "Device '%(device)' is not encrypted",
},
{
- .error_fmt = QERR_DEVICE_NOT_FOUND,
- .desc = "Device '%(device)' not found",
+ QERR_DEVICE_NOT_FOUND,
+ "Device '%(device)' not found",
},
{
- .error_fmt = QERR_DEVICE_NOT_REMOVABLE,
- .desc = "Device '%(device)' is not removable",
+ QERR_DEVICE_NOT_REMOVABLE,
+ "Device '%(device)' is not removable",
},
{
- .error_fmt = QERR_DUPLICATE_ID,
- .desc = "Duplicate ID '%(id)' for %(object)",
+ QERR_DUPLICATE_ID,
+ "Duplicate ID '%(id)' for %(object)",
},
{
- .error_fmt = QERR_FD_NOT_FOUND,
- .desc = "File descriptor named '%(name)' not found",
+ QERR_FD_NOT_FOUND,
+ "File descriptor named '%(name)' not found",
},
{
- .error_fmt = QERR_FD_NOT_SUPPLIED,
- .desc = "No file descriptor supplied via SCM_RIGHTS",
+ QERR_FD_NOT_SUPPLIED,
+ "No file descriptor supplied via SCM_RIGHTS",
},
{
- .error_fmt = QERR_FEATURE_DISABLED,
- .desc = "The feature '%(name)' is not enabled",
+ QERR_FEATURE_DISABLED,
+ "The feature '%(name)' is not enabled",
},
{
- .error_fmt = QERR_INVALID_BLOCK_FORMAT,
- .desc = "Invalid block format '%(name)'",
+ QERR_INVALID_BLOCK_FORMAT,
+ "Invalid block format '%(name)'",
},
{
- .error_fmt = QERR_INVALID_OPTION_GROUP,
- .desc = "There is no option group '%(group)'",
+ QERR_INVALID_OPTION_GROUP,
+ "There is no option group '%(group)'",
},
{
- .error_fmt = QERR_INVALID_PARAMETER,
- .desc = "Invalid parameter '%(name)'",
+ QERR_INVALID_PARAMETER,
+ "Invalid parameter '%(name)'",
},
{
- .error_fmt = QERR_INVALID_PARAMETER_COMBINATION,
- .desc = "Invalid parameter combination",
+ QERR_INVALID_PARAMETER_COMBINATION,
+ "Invalid parameter combination",
},
{
- .error_fmt = QERR_INVALID_PARAMETER_TYPE,
- .desc = "Invalid parameter type for '%(name)', expected: %(expected)",
+ QERR_INVALID_PARAMETER_TYPE,
+ "Invalid parameter type for '%(name)', expected: %(expected)",
},
{
- .error_fmt = QERR_INVALID_PARAMETER_VALUE,
- .desc = "Parameter '%(name)' expects %(expected)",
+ QERR_INVALID_PARAMETER_VALUE,
+ "Parameter '%(name)' expects %(expected)",
},
{
- .error_fmt = QERR_INVALID_PASSWORD,
- .desc = "Password incorrect",
+ QERR_INVALID_PASSWORD,
+ "Password incorrect",
},
{
- .error_fmt = QERR_IO_ERROR,
- .desc = "An IO error has occurred",
+ QERR_IO_ERROR,
+ "An IO error has occurred",
},
{
- .error_fmt = QERR_JSON_PARSE_ERROR,
- .desc = "JSON parse error, %(message)",
+ QERR_JSON_PARSE_ERROR,
+ "JSON parse error, %(message)",
},
{
- .error_fmt = QERR_JSON_PARSING,
- .desc = "Invalid JSON syntax",
+ QERR_JSON_PARSING,
+ "Invalid JSON syntax",
},
{
- .error_fmt = QERR_KVM_MISSING_CAP,
- .desc = "Using KVM without %(capability), %(feature) unavailable",
+ QERR_KVM_MISSING_CAP,
+ "Using KVM without %(capability), %(feature) unavailable",
},
{
- .error_fmt = QERR_MIGRATION_ACTIVE,
- .desc = "There's a migration process in progress",
+ QERR_MIGRATION_ACTIVE,
+ "There's a migration process in progress",
},
{
- .error_fmt = QERR_MIGRATION_NOT_SUPPORTED,
- .desc = "State blocked by non-migratable device '%(device)'",
+ QERR_MIGRATION_NOT_SUPPORTED,
+ "State blocked by non-migratable device '%(device)'",
},
{
- .error_fmt = QERR_MIGRATION_EXPECTED,
- .desc = "An incoming migration is expected before this command can be executed",
+ QERR_MIGRATION_EXPECTED,
+ "An incoming migration is expected before this command can be executed",
},
{
- .error_fmt = QERR_MISSING_PARAMETER,
- .desc = "Parameter '%(name)' is missing",
+ QERR_MISSING_PARAMETER,
+ "Parameter '%(name)' is missing",
},
{
- .error_fmt = QERR_NO_BUS_FOR_DEVICE,
- .desc = "No '%(bus)' bus found for device '%(device)'",
+ QERR_NO_BUS_FOR_DEVICE,
+ "No '%(bus)' bus found for device '%(device)'",
},
{
- .error_fmt = QERR_NOT_SUPPORTED,
- .desc = "Not supported",
+ QERR_NOT_SUPPORTED,
+ "Not supported",
},
{
- .error_fmt = QERR_OPEN_FILE_FAILED,
- .desc = "Could not open '%(filename)'",
+ QERR_OPEN_FILE_FAILED,
+ "Could not open '%(filename)'",
},
{
- .error_fmt = QERR_PERMISSION_DENIED,
- .desc = "Insufficient permission to perform this operation",
+ QERR_PERMISSION_DENIED,
+ "Insufficient permission to perform this operation",
},
{
- .error_fmt = QERR_PROPERTY_NOT_FOUND,
- .desc = "Property '%(device).%(property)' not found",
+ QERR_PROPERTY_NOT_FOUND,
+ "Property '%(device).%(property)' not found",
},
{
- .error_fmt = QERR_PROPERTY_VALUE_BAD,
- .desc = "Property '%(device).%(property)' doesn't take value '%(value)'",
+ QERR_PROPERTY_VALUE_BAD,
+ "Property '%(device).%(property)' doesn't take value '%(value)'",
},
{
- .error_fmt = QERR_PROPERTY_VALUE_IN_USE,
- .desc = "Property '%(device).%(property)' can't take value '%(value)', it's in use",
+ QERR_PROPERTY_VALUE_IN_USE,
+ "Property '%(device).%(property)' can't take value '%(value)', it's in use",
},
{
- .error_fmt = QERR_PROPERTY_VALUE_NOT_FOUND,
- .desc = "Property '%(device).%(property)' can't find value '%(value)'",
+ QERR_PROPERTY_VALUE_NOT_FOUND,
+ "Property '%(device).%(property)' can't find value '%(value)'",
},
{
- .error_fmt = QERR_PROPERTY_VALUE_NOT_POWER_OF_2,
- .desc = "Property '%(device).%(property)' doesn't take "
+ QERR_PROPERTY_VALUE_NOT_POWER_OF_2,
+ "Property '%(device).%(property)' doesn't take "
"value '%(value)', it's not a power of 2",
},
{
- .error_fmt = QERR_PROPERTY_VALUE_OUT_OF_RANGE,
- .desc = "Property '%(device).%(property)' doesn't take "
+ QERR_PROPERTY_VALUE_OUT_OF_RANGE,
+ "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)'",
+ QERR_QGA_COMMAND_FAILED,
+ "Guest agent command failed, error was '%(message)'",
},
{
- .error_fmt = QERR_QGA_LOGGING_FAILED,
- .desc = "Guest agent failed to log non-optional log statement",
+ QERR_QGA_LOGGING_FAILED,
+ "Guest agent failed to log non-optional log statement",
},
{
- .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,
- .desc = "Expected '%(expected)' in QMP input",
+ QERR_QMP_BAD_INPUT_OBJECT,
+ "Expected '%(expected)' in QMP input",
},
{
- .error_fmt = QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
- .desc = "QMP input object member '%(member)' expects '%(expected)'",
+ QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
+ "QMP input object member '%(member)' expects '%(expected)'",
},
{
- .error_fmt = QERR_QMP_EXTRA_MEMBER,
- .desc = "QMP input object member '%(member)' is unexpected",
+ QERR_QMP_EXTRA_MEMBER,
+ "QMP input object member '%(member)' is unexpected",
},
{
- .error_fmt = QERR_RESET_REQUIRED,
- .desc = "Resetting the Virtual Machine is required",
+ QERR_RESET_REQUIRED,
+ "Resetting the Virtual Machine is required",
},
{
- .error_fmt = QERR_SET_PASSWD_FAILED,
- .desc = "Could not set password",
+ QERR_SET_PASSWD_FAILED,
+ "Could not set password",
},
{
- .error_fmt = QERR_TOO_MANY_FILES,
- .desc = "Too many open files",
+ QERR_TOO_MANY_FILES,
+ "Too many open files",
},
{
- .error_fmt = QERR_UNDEFINED_ERROR,
- .desc = "An undefined error has occurred",
+ QERR_UNDEFINED_ERROR,
+ "An undefined error has occurred",
},
{
- .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
- .desc = "'%(device)' uses a %(format) feature which is not "
+ QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
+ "'%(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",
+ QERR_UNSUPPORTED,
+ "this feature or command is not currently supported",
},
{
- .error_fmt = QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
- .desc = "Migration is disabled when VirtFS export path '%(path)' "
+ QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION,
+ "Migration is disabled when VirtFS export path '%(path)' "
"is mounted in the guest using mount_tag '%(tag)'",
},
{
- .error_fmt = QERR_VNC_SERVER_FAILED,
- .desc = "Could not start VNC server on %(target)",
+ QERR_VNC_SERVER_FAILED,
+ "Could not start VNC server on %(target)",
},
{
- .error_fmt = QERR_SOCKET_CONNECT_IN_PROGRESS,
- .desc = "Connection can not be completed immediately",
+ QERR_SOCKET_CONNECT_IN_PROGRESS,
+ "Connection can not be completed immediately",
},
{
- .error_fmt = QERR_SOCKET_CONNECT_FAILED,
- .desc = "Failed to connect to socket",
+ QERR_SOCKET_CONNECT_FAILED,
+ "Failed to connect to socket",
},
{
- .error_fmt = QERR_SOCKET_LISTEN_FAILED,
- .desc = "Failed to set socket to listening mode",
+ QERR_SOCKET_LISTEN_FAILED,
+ "Failed to set socket to listening mode",
},
{
- .error_fmt = QERR_SOCKET_BIND_FAILED,
- .desc = "Failed to bind socket",
+ QERR_SOCKET_BIND_FAILED,
+ "Failed to bind socket",
},
{
- .error_fmt = QERR_SOCKET_CREATE_FAILED,
- .desc = "Failed to create socket",
+ QERR_SOCKET_CREATE_FAILED,
+ "Failed to create socket",
},
{}
};
diff --git a/qerror.h b/qerror.h
index de8497d..f1c4917 100644
--- a/qerror.h
+++ b/qerror.h
@@ -19,8 +19,8 @@
#include <stdarg.h>
typedef struct QErrorStringTable {
- const char *desc;
const char *error_fmt;
+ const char *desc;
} QErrorStringTable;
typedef struct QError {
--
1.7.11.2.249.g31c7954.dirty
next prev parent reply other threads:[~2012-07-27 21:32 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 21:31 [Qemu-devel] [RFC 00/27]: add new error format Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 01/27] monitor: drop unused monitor debug code Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 02/27] qerror: QERR_AMBIGUOUS_PATH: drop %(object) from human msg Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 03/27] qerror: QERR_DEVICE_ENCRYPTED: add filename info to " Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 04/27] qerror: reduce public exposure Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 05/27] qerror: drop qerror_abort() Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 06/27] qerror: QError: drop file, linenr, func Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 07/27] qerror: qerror_format(): return an allocated string Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 08/27] qerror: don't delay error message construction Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 09/27] error: " Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 10/27] qmp: query-block: add 'valid_encryption_key' field Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 11/27] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED Luiz Capitulino
2012-08-01 11:37 ` Markus Armbruster
2012-08-01 13:47 ` Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 12/27] hmp: hmp_change(): don't use error_get_field() Luiz Capitulino
2012-08-01 12:39 ` Markus Armbruster
2012-08-01 12:49 ` Anthony Liguori
2012-08-01 13:51 ` Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 13/27] error: error_is_type(): " Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 14/27] error: drop functions used to get error data Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 15/27] block: block_int: include qerror.h Luiz Capitulino
2012-08-01 12:42 ` Markus Armbruster
2012-08-01 13:58 ` Luiz Capitulino
2012-08-02 15:59 ` Markus Armbruster
2012-07-27 21:31 ` [Qemu-devel] [PATCH 16/27] hmp: hmp.h: include qdict.h Luiz Capitulino
2012-08-01 12:42 ` Markus Armbruster
2012-07-27 21:31 ` [Qemu-devel] [PATCH 17/27] qapi: qapi-types.h: don't include qapi/qapi-types-core.h Luiz Capitulino
2012-07-27 21:31 ` [Qemu-devel] [PATCH 18/27] qapi: generate correct enum names for camel case enums Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 19/27] qapi: don't convert enum strings to lowercase Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 20/27] qapi-schema: add ErrorClass enum Luiz Capitulino
2012-07-28 14:42 ` Eric Blake
2012-07-27 21:32 ` Luiz Capitulino [this message]
2012-07-27 21:32 ` [Qemu-devel] [PATCH 22/27] error, qerror: add ErrorClass argument to error functions Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 23/27] qerror: use ErrorClass for QERR_ macro Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 24/27] qmp: switch to the new error format on the wire Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 25/27] qapi: qapi.py: allow the "'" character be escaped Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 26/27] error, qerror: pass desc string to error calls Luiz Capitulino
2012-08-01 11:37 ` Amos Kong
2012-08-01 13:31 ` Luiz Capitulino
2012-07-27 21:32 ` [Qemu-devel] [PATCH 27/27] qerror: drop qerror_table and qerror_format() Luiz Capitulino
2012-07-31 14:44 ` [Qemu-devel] [RFC 00/27]: add new error format Luiz Capitulino
2012-08-01 11:33 ` Amos Kong
2012-08-01 13:29 ` Luiz Capitulino
2012-08-02 2:31 ` Amos Kong
2012-08-02 13:31 ` Luiz Capitulino
2012-08-06 6:35 ` Amos Kong
2012-08-06 13:01 ` Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343424728-22461-22-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).