Re: [PATCH v4 5/8] Add migrate_set_ports into migrate_qmp to update migration port value

[Het Gala <het.gala@nutanix.com>]

[-- Attachment #1: Type: text/plain, Size: 4419 bytes --]


On 12/03/24 12:12 am, Fabiano Rosas wrote:
> Het Gala<het.gala@nutanix.com>  writes:
>
>> migrate_set_get_qdict gets qdict with the dst QEMU parameters
> s/set_//
Ack
>> migrate_set_ports() from list of channels reads each QDict for port,
>> and fills the port with correct value in case it was 0 in the test.
>>
>> Signed-off-by: Het Gala<het.gala@nutanix.com>
>> Suggested-by: Fabiano Rosas<farosas@suse.de>
>> ---
>>   tests/qtest/migration-helpers.c | 73 +++++++++++++++++++++++++++++++++
>>   1 file changed, 73 insertions(+)
>>
>> diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
>> index 91c8a817d2..7c17d78d6b 100644
>> --- a/tests/qtest/migration-helpers.c
>> +++ b/tests/qtest/migration-helpers.c
>> @@ -17,6 +17,8 @@
>>   #include "qapi/qapi-visit-sockets.h"
>>   #include "qapi/qobject-input-visitor.h"
>>   #include "qapi/error.h"
>> +#include "qapi/qmp/qlist.h"
>> +#include "include/qemu/cutils.h"
> Extra "include/" here?
Ack
>>   
>>   #include "migration-helpers.h"
>>   
>> @@ -49,6 +51,37 @@ static char *SocketAddress_to_str(SocketAddress *addr)
>>       }
>>   }
>>   
>> +static QDict *SocketAddress_to_qdict(SocketAddress *addr)
>> +{
>> +    QDict *dict = qdict_new();
>> +
>> +    switch (addr->type) {
>> +    case SOCKET_ADDRESS_TYPE_INET:
>> +        qdict_put_str(dict, "type", "inet");
>> +        qdict_put_str(dict, "host", addr->u.inet.host);
>> +        qdict_put_str(dict, "port", addr->u.inet.port);
>> +        break;
>> +    case SOCKET_ADDRESS_TYPE_UNIX:
>> +        qdict_put_str(dict, "type", "unix");
>> +        qdict_put_str(dict, "path", addr->u.q_unix.path);
>> +        break;
>> +    case SOCKET_ADDRESS_TYPE_FD:
>> +        qdict_put_str(dict, "type", "fd");
>> +        qdict_put_str(dict, "str", addr->u.fd.str);
>> +        break;
>> +    case SOCKET_ADDRESS_TYPE_VSOCK:
>> +        qdict_put_str(dict, "type", "vsock");
>> +        qdict_put_str(dict, "cid", addr->u.vsock.cid);
>> +        qdict_put_str(dict, "port", addr->u.vsock.port);
>> +        break;
>> +    default:
>> +        g_assert_not_reached();
>> +        break;
>> +    }
>> +
>> +    return dict;
>> +}
>> +
>>   static SocketAddress *
>>   migrate_get_socket_address(QTestState *who, const char *parameter)
>>   {
>> @@ -83,6 +116,44 @@ migrate_get_connect_uri(QTestState *who, const char *parameter)
>>       return connect_uri;
>>   }
>>   
>> +static QDict *
>> +migrate_get_connect_qdict(QTestState *who, const char *parameter)
>> +{
>> +    SocketAddress *addrs;
>> +    QDict *connect_qdict;
>> +
>> +    addrs = migrate_get_socket_address(who, parameter);
>> +    connect_qdict = SocketAddress_to_qdict(addrs);
>> +
>> +    qapi_free_SocketAddress(addrs);
>> +    return connect_qdict;
>> +}
>> +
>> +static void migrate_set_ports(QTestState *to, QList *channel_list)
>> +{
>> +    QDict *addr;
>> +    QListEntry *entry;
>> +    g_autofree const char *addr_port = NULL;
>> +
>> +    if (channel_list == NULL) {
>> +        return;
>> +    }
>> +
>> +    addr = migrate_get_connect_qdict(to, "socket-address");
> addr needs to be freed.
Ack. Thanks for pointing this out
>> +
>> +    QLIST_FOREACH_ENTRY(channel_list, entry) {
>> +        QDict *channel = qobject_to(QDict, qlist_entry_obj(entry));
>> +        QDict *addrdict = qdict_get_qdict(channel, "addr");
>> +
>> +        if (qdict_haskey(addrdict, "port") &&
>> +            qdict_haskey(addr, "port") &&
>> +            (strcmp(qdict_get_str(addrdict, "port"), "0") == 0)) {
>> +                addr_port = qdict_get_str(addr, "port");
>> +                qdict_put_str(addrdict, "port", addr_port);
>> +        }
>> +    }
>> +}
>> +
>>   bool migrate_watch_for_events(QTestState *who, const char *name,
>>                                 QDict *event, void *opaque)
>>   {
>> @@ -141,6 +212,7 @@ void migrate_qmp(QTestState *who, QTestState *to, const char *uri,
>>   {
>>       va_list ap;
>>       QDict *args;
>> +    QList *channel_list = NULL;
>>       g_autofree char *connect_uri = NULL;
>>   
>>       va_start(ap, fmt);
>> @@ -151,6 +223,7 @@ void migrate_qmp(QTestState *who, QTestState *to, const char *uri,
>>       if (!uri) {
>>           connect_uri = migrate_get_connect_uri(to, "socket-address");
>>       }
>> +    migrate_set_ports(to, channel_list);
>>       qdict_put_str(args, "uri", uri ? uri : connect_uri);
>>   
>>       qtest_qmp_assert_success(who,
Regards,
Het Gala

[-- Attachment #2: Type: text/html, Size: 6002 bytes --]