| Message ID | 20180509120140.6612-2-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/09/2018 07:01 AM, Juan Quintela wrote: > It will be used to store the uri parameters. We want this only for > tcp, so we don't set it for other uris. We need it to know what port > is migration running. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > > -- > > +++ b/qapi/migration.json > @@ -6,6 +6,7 @@ > ## > > { 'include': 'common.json' } > +{ 'include': 'sockets.json' } > > ## > # @MigrationStats: > @@ -169,6 +170,7 @@ > # only present when the postcopy-blocktime migration capability > # is enabled. (Since 2.13) > # > +# @socket-address: Only used for tcp, to know what the real port is (Since 2.13) Maybe s/real port is/real ports are/, since... > # > # Since: 0.14.0 > ## > @@ -183,7 +185,8 @@ > '*cpu-throttle-percentage': 'int', > '*error-desc': 'str', > '*postcopy-blocktime' : 'uint32', > - '*postcopy-vcpu-blocktime': ['uint32']} } > + '*postcopy-vcpu-blocktime': ['uint32'], > + '*socket-address': ['SocketAddress'] } } ...an array is potentially plural. > > ## > # @query-migrate: > @@ -690,6 +693,7 @@ > # needs to be a multiple of the target page size > # and a power of 2 > # (Since 2.11) > +# > # Since: 2.4 > ## > { 'struct': 'MigrationParameters', Spurious hunk? Although it looks reasonable, it could be a separate trivial cleanup patch. > diff --git a/qapi/sockets.json b/qapi/sockets.json > index fc81d8d5e8..f1ca09a927 100644 > --- a/qapi/sockets.json > +++ b/qapi/sockets.json > @@ -152,3 +152,16 @@ > 'unix': 'UnixSocketAddress', > 'vsock': 'VsockSocketAddress', > 'fd': 'String' } } > + > +## > +# @DummyStruct: > +# > +# Both block-core and migration needs SocketAddressList s/needs/need/ > +# I am open to comments about how to share it Since this is two sentences, trailing '.' would help. > +# > +# @dummy-list: A dummy list > +# > +# Since: 2.13 > +## > +{ 'struct': 'DummyStruct', > + 'data': { 'dummy-list': ['SocketAddress'] } } > We've used this idiom elsewhere; it might be better to amend DummyForceArrays in qapi/misc.json, except then misc.json might need to include sockets.json for the definition of SocketAddress.
Eric Blake <eblake@redhat.com> wrote: >> +++ b/qapi/migration.json >> @@ -6,6 +6,7 @@ >> ## >> { 'include': 'common.json' } >> +{ 'include': 'sockets.json' } >> ## >> # @MigrationStats: >> @@ -169,6 +170,7 @@ >> # only present when the postcopy-blocktime migration capability >> # is enabled. (Since 2.13) >> # >> +# @socket-address: Only used for tcp, to know what the real port is (Since 2.13) > > Maybe s/real port is/real ports are/, since... done. > >> # >> # Since: 0.14.0 >> ## >> @@ -183,7 +185,8 @@ >> '*cpu-throttle-percentage': 'int', >> '*error-desc': 'str', >> '*postcopy-blocktime' : 'uint32', >> - '*postcopy-vcpu-blocktime': ['uint32']} } >> + '*postcopy-vcpu-blocktime': ['uint32'], >> + '*socket-address': ['SocketAddress'] } } > > ...an array is potentially plural. done. (didn't like to put so many s's, but ...) >> ## >> # @query-migrate: >> @@ -690,6 +693,7 @@ >> # needs to be a multiple of the target page size >> # and a power of 2 >> # (Since 2.11) >> +# >> # Since: 2.4 >> ## >> { 'struct': 'MigrationParameters', > > Spurious hunk? Although it looks reasonable, it could be a separate > trivial cleanup patch. Fixed thanks. > >> diff --git a/qapi/sockets.json b/qapi/sockets.json >> index fc81d8d5e8..f1ca09a927 100644 >> --- a/qapi/sockets.json >> +++ b/qapi/sockets.json >> @@ -152,3 +152,16 @@ >> 'unix': 'UnixSocketAddress', >> 'vsock': 'VsockSocketAddress', >> 'fd': 'String' } } >> + >> +## >> +# @DummyStruct: >> +# >> +# Both block-core and migration needs SocketAddressList > > s/needs/need/ done >> +# I am open to comments about how to share it > > Since this is two sentences, trailing '.' would help. done >> +# >> +# @dummy-list: A dummy list >> +# >> +# Since: 2.13 >> +## >> +{ 'struct': 'DummyStruct', >> + 'data': { 'dummy-list': ['SocketAddress'] } } >> > > We've used this idiom elsewhere; it might be better to amend > DummyForceArrays in qapi/misc.json, except then misc.json might need > to include sockets.json for the definition of SocketAddress. Not done. It needs more qapi magic that puttingthe socket.json include there, so this one stays. Putting it there means including qapi/<vhateve>-misc.h in several places, I think it is easier this way (famous last words). Later, Juan.
diff --git a/hmp.c b/hmp.c index 35a23d8cb8..63e718bd69 100644 --- a/hmp.c +++ b/hmp.c @@ -166,6 +166,26 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict) qapi_free_MouseInfoList(mice_list); } +static char *SocketAddress_to_str(SocketAddress *addr) +{ + switch (addr->type) { + case SOCKET_ADDRESS_TYPE_INET: + return g_strdup_printf("tcp:%s:%s", + addr->u.inet.host, + addr->u.inet.port); + break; + case SOCKET_ADDRESS_TYPE_UNIX: + return g_strdup_printf("unix:%s", + addr->u.q_unix.path); + break; + case SOCKET_ADDRESS_TYPE_FD: + return g_strdup_printf("fd:%s", addr->u.fd.str); + break; + default: + abort(); + } +} + void hmp_info_migrate(Monitor *mon, const QDict *qdict) { MigrationInfo *info; @@ -289,6 +309,17 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) g_free(str); visit_free(v); } + if (info->has_socket_address) { + SocketAddressList *addr; + + monitor_printf(mon, "socket address: [\n"); + + for (addr = info->socket_address; addr; addr = addr->next) { + char *s = SocketAddress_to_str(addr->value); + monitor_printf(mon, "\t%s\n", s); + } + monitor_printf(mon, "]\n"); + } qapi_free_MigrationInfo(info); qapi_free_MigrationCapabilityStatusList(caps); } diff --git a/migration/migration.c b/migration/migration.c index 05aec2c905..11d16a80c7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -31,6 +31,8 @@ #include "migration/vmstate.h" #include "block/block.h" #include "qapi/error.h" +#include "qapi/clone-visitor.h" +#include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" @@ -193,6 +195,11 @@ void migration_incoming_state_destroy(void) } qemu_event_reset(&mis->main_thread_load_event); + + if (mis->socket_address) { + qapi_free_SocketAddressList(mis->socket_address); + mis->socket_address = NULL; + } } static void migrate_generate_event(int new_state) @@ -282,6 +289,17 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname, return migrate_send_rp_message(mis, msg_type, msglen, bufc); } +void migrate_add_address(SocketAddress *address) +{ + MigrationIncomingState *mis = migration_incoming_get_current(); + SocketAddressList *addrs; + + addrs = g_new0(SocketAddressList, 1); + addrs->next = mis->socket_address; + mis->socket_address = addrs; + addrs->value = QAPI_CLONE(SocketAddress, address); +} + void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; @@ -843,6 +861,11 @@ static void fill_destination_migration_info(MigrationInfo *info) { MigrationIncomingState *mis = migration_incoming_get_current(); + if (mis->socket_address) { + info->has_socket_address = true; + info->socket_address = QAPI_CLONE(SocketAddressList, mis->socket_address); + } + switch (mis->state) { case MIGRATION_STATUS_NONE: return; diff --git a/migration/migration.h b/migration/migration.h index 8f0c82159b..16c26600e2 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -80,6 +80,9 @@ struct MigrationIncomingState { bool postcopy_recover_triggered; QemuSemaphore postcopy_pause_sem_dst; QemuSemaphore postcopy_pause_sem_fault; + + /* List of listening socket addresses */ + SocketAddressList *socket_address; }; MigrationIncomingState *migration_incoming_get_current(void); @@ -276,5 +279,6 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value); void dirty_bitmap_mig_before_vm_start(void); void init_dirty_bitmap_incoming_migration(void); +void migrate_add_address(SocketAddress *address); #endif diff --git a/migration/socket.c b/migration/socket.c index 3456eb76e9..0eb9b53f81 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -182,6 +183,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr, Error **errp) { QIONetListener *listener = qio_net_listener_new(); + size_t i; qio_net_listener_set_name(listener, "migration-socket-listener"); @@ -194,6 +196,15 @@ static void socket_start_incoming_migration(SocketAddress *saddr, socket_accept_incoming_migration, NULL, NULL, g_main_context_get_thread_default()); + + for (i = 0; i < listener->nsioc; i++) { + SocketAddress *address = + qio_channel_socket_get_local_address(listener->sioc[i], errp); + if (!address) { + return; + } + migrate_add_address(address); + } } void tcp_start_incoming_migration(const char *host_port, Error **errp) diff --git a/qapi/migration.json b/qapi/migration.json index 66c6b38f88..9085007ff8 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -6,6 +6,7 @@ ## { 'include': 'common.json' } +{ 'include': 'sockets.json' } ## # @MigrationStats: @@ -169,6 +170,7 @@ # only present when the postcopy-blocktime migration capability # is enabled. (Since 2.13) # +# @socket-address: Only used for tcp, to know what the real port is (Since 2.13) # # Since: 0.14.0 ## @@ -183,7 +185,8 @@ '*cpu-throttle-percentage': 'int', '*error-desc': 'str', '*postcopy-blocktime' : 'uint32', - '*postcopy-vcpu-blocktime': ['uint32']} } + '*postcopy-vcpu-blocktime': ['uint32'], + '*socket-address': ['SocketAddress'] } } ## # @query-migrate: @@ -690,6 +693,7 @@ # needs to be a multiple of the target page size # and a power of 2 # (Since 2.11) +# # Since: 2.4 ## { 'struct': 'MigrationParameters', diff --git a/qapi/sockets.json b/qapi/sockets.json index fc81d8d5e8..f1ca09a927 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -152,3 +152,16 @@ 'unix': 'UnixSocketAddress', 'vsock': 'VsockSocketAddress', 'fd': 'String' } } + +## +# @DummyStruct: +# +# Both block-core and migration needs SocketAddressList +# I am open to comments about how to share it +# +# @dummy-list: A dummy list +# +# Since: 2.13 +## +{ 'struct': 'DummyStruct', + 'data': { 'dummy-list': ['SocketAddress'] } }
It will be used to store the uri parameters. We want this only for tcp, so we don't set it for other uris. We need it to know what port is migration running. Signed-off-by: Juan Quintela <quintela@redhat.com> -- This used to be uri parameter, but it has so many troubles to reproduce that it don't just make sense. This used to be a port parameter. I was asked to move to SocketAddress, done. I also merged the setting of the migration tcp port in this one because now I need to free the address, and this makes it easier. This used to be x-socket-address with a single direction, now it is a list of addresses. Move SocketAddress_to_str here. I used to try to generalize the one in chardev/char-socket.c, but it is not worth it. --- hmp.c | 31 +++++++++++++++++++++++++++++++ migration/migration.c | 23 +++++++++++++++++++++++ migration/migration.h | 4 ++++ migration/socket.c | 11 +++++++++++ qapi/migration.json | 6 +++++- qapi/sockets.json | 13 +++++++++++++ 6 files changed, 87 insertions(+), 1 deletion(-)