| Message ID | 20180307110010.2205-13-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multifd | expand |
On Wed, Mar 07, 2018 at 11:59:58AM +0100, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > migration/socket.c | 11 +++++++++++ > migration/socket.h | 7 +++++++ > 2 files changed, 18 insertions(+) > > diff --git a/migration/socket.c b/migration/socket.c > index b12b0a462e..26110739cf 100644 > --- a/migration/socket.c > +++ b/migration/socket.c > @@ -27,6 +27,17 @@ > #include "io/channel-socket.h" > #include "trace.h" > > +int socket_recv_channel_ref(QIOChannel *recv) > +{ > + object_ref(OBJECT(recv)); > + return 0; > +} > + > +int socket_recv_channel_unref(QIOChannel *recv) > +{ > + object_unref(OBJECT(recv)); > + return 0; > +} These helpers don't really add any value IMHO - just call object_ref/unref directly where needed. We don't provide explicit qio_channel_ref() wrappers around object_ref because they add no value. > > static SocketAddress *tcp_build_address(const char *host_port, Error **errp) > { > diff --git a/migration/socket.h b/migration/socket.h > index 6b91e9db38..638a85255a 100644 > --- a/migration/socket.h > +++ b/migration/socket.h > @@ -16,6 +16,13 @@ > > #ifndef QEMU_MIGRATION_SOCKET_H > #define QEMU_MIGRATION_SOCKET_H > + > +#include "io/channel.h" > +#include "io/task.h" > + > +int socket_recv_channel_ref(QIOChannel *recv); > +int socket_recv_channel_unref(QIOChannel *recv); > + > void tcp_start_incoming_migration(const char *host_port, Error **errp); > > void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, > -- > 2.14.3 > > Regards, Daniel
diff --git a/migration/socket.c b/migration/socket.c index b12b0a462e..26110739cf 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -27,6 +27,17 @@ #include "io/channel-socket.h" #include "trace.h" +int socket_recv_channel_ref(QIOChannel *recv) +{ + object_ref(OBJECT(recv)); + return 0; +} + +int socket_recv_channel_unref(QIOChannel *recv) +{ + object_unref(OBJECT(recv)); + return 0; +} static SocketAddress *tcp_build_address(const char *host_port, Error **errp) { diff --git a/migration/socket.h b/migration/socket.h index 6b91e9db38..638a85255a 100644 --- a/migration/socket.h +++ b/migration/socket.h @@ -16,6 +16,13 @@ #ifndef QEMU_MIGRATION_SOCKET_H #define QEMU_MIGRATION_SOCKET_H + +#include "io/channel.h" +#include "io/task.h" + +int socket_recv_channel_ref(QIOChannel *recv); +int socket_recv_channel_unref(QIOChannel *recv); + void tcp_start_incoming_migration(const char *host_port, Error **errp); void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/socket.c | 11 +++++++++++ migration/socket.h | 7 +++++++ 2 files changed, 18 insertions(+)