Re: [Qemu-devel] [PATCH V2 2/3] qmp: Make Quorum error events more palatable.

[Eric Blake <eblake@redhat.com>]

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

On 02/21/2014 06:20 PM, Benoît Canet wrote:
> Insert quorum QMP events documentation alphabetically.
> 
> Also change the "ret" errno value by an optional "error" being an strerror(-ret)
> in the QUORUM_REPORT_BAD qmp event.
> 
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---

>      assert(node_name);
> -    data = qobject_from_jsonf("{ 'ret': %d"
> -                              ", 'node-name': %s"
> +    data = qobject_from_jsonf("{ 'node-name': %s"
>                                ", 'sector-num': %" PRId64
>                                ", 'sectors-count': %d }",
> -                              ret, node_name, acb->sector_num, acb->nb_sectors);
> +                              node_name, acb->sector_num, acb->nb_sectors);
> +    if (ret < 0) {
> +        QDict *dict = qobject_to_qdict(data);
> +        qdict_put(dict, "error", qstring_from_str(strerror(-ret)));
> +    }

This puts it in dict, but never modifies data...

>      monitor_protocol_event(QEVENT_QUORUM_REPORT_BAD, data);

...but you send data, not dict, over the wire.

It might be easier to do something like...

char *str = NULL;
if (ret < 0)
    str = strerror(-ret);
data = qobject_from_jsonf("{ 'node-name': %s"
                          "%s%s%s"
                          ", 'sector-num': %" PRId64
                          ", 'sectors-cont': %d }",
                          node_name,
                          str ? ", 'error': \"" : "", str ? str : "",
                          str ? "\"" : "",
...);

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]