Re: [Qemu-devel] [PATCH 12/17] migration: Convert do_info_migrate() to QObject

[Anthony Liguori]

Luiz Capitulino wrote:
> Return a QDict, which may contain more two QDicts, depending on
> the type of migration we're performing.
>
> IMPORTANT: as a QInt stores a int64_t integer, RAM values are going
> to be stored as int64_t and not as uint64_t as they are today. If
> this is a problem QInt will have to be changed.
>
> This commit should not change user output.
>
> Signed-off-by: Luiz Capitulino <address@hidden>
> ---
>  migration.c |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
>  migration.h |    4 +-
>  monitor.c   |    3 +-
>  3 files changed, 108 insertions(+), 17 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index d6a3e26..bfaa2db 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -19,6 +19,7 @@
>  #include "block.h"
>  #include "qemu_socket.h"
>  #include "block-migration.h"
> +#include "qemu-objects.h"
>  
>  //#define DEBUG_MIGRATION
>  
> @@ -163,37 +164,124 @@ void do_migrate_set_downtime(Monitor *mon, const QDict *qdict)
>      max_downtime = (uint64_t)d;
>  }
>  
> -void do_info_migrate(Monitor *mon)
> +static void migrate_print_status(Monitor *mon, const char *name,
> +                                 const QDict *status_dict)
>  {
> +    QDict *qdict;
> +
> +    qdict = qobject_to_qdict(qdict_get(status_dict, name));
> +
> +    monitor_printf(mon, "transferred %s: %" PRIu64 " kbytes\n", name,
> +                        qdict_get_int(qdict, "transferred") >> 10);
> +    monitor_printf(mon, "remaining %s: %" PRIu64 " kbytes\n", name,
> +                        qdict_get_int(qdict, "remaining") >> 10);
> +    monitor_printf(mon, "total %s: %" PRIu64 " kbytes\n", name,
> +                        qdict_get_int(qdict, "total") >> 10);
> +}
> +
> +void do_info_migrate_print(Monitor *mon, const QObject *data)
> +{
> +    QDict *qdict;
> +
> +    qdict = qobject_to_qdict(data);
> +
> +    monitor_printf(mon, "Migration status: %s\n",
> +                   qdict_get_str(qdict, "status"));
> +
> +    if (qdict_haskey(qdict, "ram")) {
> +        migrate_print_status(mon, "ram", qdict);
> +    }
> +
> +    if (qdict_haskey(qdict, "disk")) {
> +        migrate_print_status(mon, "disk", qdict);
> +    }
> +}
> +
> +static void migrate_put_status(QDict *qdict, const char *name,
> +                               uint64_t trans, uint64_t rem, uint64_t total)
> +{
> +    QObject *obj;
> +
> +    obj = qobject_from_jsonf("{ 'transferred': %" PRId64 ", "
> +                               "'remaining': %" PRId64 ", "
> +                               "'total': %" PRId64 " }", trans >> 10,
> +                               rem >> 10, total >> 10);
> +    assert(obj != NULL);
> +
> +    qdict_put_obj(qdict, name, obj);
> +}
> +
> +/**
> + * do_info_migrate(): Migration status
> + *
> + * Return a QDict. If migration is active there will be another
> + * QDict with RAM migration status and if block migration is active
> + * another one with block migration status.
> + *
> + * The main QDict contains the following:
> + *
> + * - "status": migration status
> + * - "ram": only present if "status" is "active", it is a QDict with the
> + *   following RAM information (in bytes):
>   

The implementation in migrate_put_status disagrees with your documentation.

Regards,

Anthony Liguori