The error class name is SockConnectInprogress, not SockConnectInProgress.
Rename the QERR_SOCK_CONNECT_IN_PROGRESS macro to QERR_SOCK_CONNECT_INPROGRESS
to reflect that, so that future error macro generation generates the
expected macro name.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
migration-tcp.c | 2 +-
qemu-sockets.c | 2 +-
qerror.c | 2 +-
qerror.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 587fc70..3cffa94 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -90,7 +90,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const
char *host_port,
if (!error_is_set(errp)) {
migrate_fd_connect(s);
- } else if (error_is_type(*errp, QERR_SOCK_CONNECT_IN_PROGRESS)) {
+ } else if (error_is_type(*errp, QERR_SOCK_CONNECT_INPROGRESS)) {
DPRINTF("connect in progress\n");
qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
} else if (error_is_type(*errp, QERR_SOCK_CREATE_FAILED)) {
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 1357ec0..20def3e 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -274,7 +274,7 @@ int inet_connect_opts(QemuOpts *opts, Error **errp)
#else
if (!block && (rc == -EINPROGRESS)) {
#endif
- error_set(errp, QERR_SOCK_CONNECT_IN_PROGRESS);
+ error_set(errp, QERR_SOCK_CONNECT_INPROGRESS);
} else if (rc < 0) {
if (NULL == e->ai_next)
fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__,
diff --git a/qerror.c b/qerror.c
index e988e36..a9d771b 100644
--- a/qerror.c
+++ b/qerror.c
@@ -309,7 +309,7 @@ static const QErrorStringTable qerror_table[] = {
.desc = "Could not start VNC server on %(target)",
},
{
- .error_fmt = QERR_SOCK_CONNECT_IN_PROGRESS,
+ .error_fmt = QERR_SOCK_CONNECT_INPROGRESS,
.desc = "Connection can not be completed immediately",
},
{
diff --git a/qerror.h b/qerror.h
index 71b0496..69d417d 100644
--- a/qerror.h
+++ b/qerror.h
@@ -251,7 +251,7 @@ QError *qobject_to_qerror(const QObject *obj);
#define QERR_VNC_SERVER_FAILED \
"{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }"
-#define QERR_SOCK_CONNECT_IN_PROGRESS \
+#define QERR_SOCK_CONNECT_INPROGRESS \
"{ 'class': 'SockConnectInprogress', 'data': {} }"
#define QERR_SOCK_CONNECT_FAILED \
--
1.7.11.2.249.g31c7954.dirty
