From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WH1bX-0001jM-Dz for qemu-devel@nongnu.org; Fri, 21 Feb 2014 20:42:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WH1bS-0005ZX-Rw for qemu-devel@nongnu.org; Fri, 21 Feb 2014 20:42:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WH1bS-0005ZC-Jw for qemu-devel@nongnu.org; Fri, 21 Feb 2014 20:42:06 -0500 Message-ID: <53080069.8080600@redhat.com> Date: Fri, 21 Feb 2014 18:42:01 -0700 From: Eric Blake MIME-Version: 1.0 References: <1393032048-17982-1-git-send-email-benoit.canet@irqsave.net> <1393032048-17982-3-git-send-email-benoit.canet@irqsave.net> In-Reply-To: <1393032048-17982-3-git-send-email-benoit.canet@irqsave.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WUnMksDVq68wxC1ONISkhEosaJIXeGkeo" Subject: Re: [Qemu-devel] [PATCH V2 2/3] qmp: Make Quorum error events more palatable. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , qemu-devel@nongnu.org Cc: kwolf@redhat.com, Benoit Canet , stefanha@redhat.com, mreitz@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WUnMksDVq68wxC1ONISkhEosaJIXeGkeo Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02/21/2014 06:20 PM, Beno=C3=AEt Canet wrote: > Insert quorum QMP events documentation alphabetically. >=20 > Also change the "ret" errno value by an optional "error" being an strer= ror(-ret) > in the QUORUM_REPORT_BAD qmp event. >=20 > Signed-off-by: Benoit Canet > --- > assert(node_name); > - data =3D qobject_from_jsonf("{ 'ret': %d" > - ", 'node-name': %s" > + data =3D 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_sect= ors); > + if (ret < 0) { > + QDict *dict =3D 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); =2E..but you send data, not dict, over the wire. It might be easier to do something like... char *str =3D NULL; if (ret < 0) str =3D strerror(-ret); data =3D qobject_from_jsonf("{ 'node-name': %s" "%s%s%s" ", 'sector-num': %" PRId64 ", 'sectors-cont': %d }", node_name, str ? ", 'error': \"" : "", str ? str : "", str ? "\"" : "", =2E..); --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --WUnMksDVq68wxC1ONISkhEosaJIXeGkeo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTCABpAAoJEKeha0olJ0Nq1CcIAKKTVv/lJAghib3y9RUFCpeF nVttDWQiyCk0yN4JmZ4O2w1oozvbHbudwFuWhzUxO73gvDmAIRSYRZqetTWxluf3 MQjTvNLSJZ9wuebsVLBouXrRRtdgXqkOhT83gcBXq08ThtbnV4PehECUIpS9BTEU rjtvSlUBqiE5YLck0m+9Bb2oH6BRM76uQNbxpxXgnuYh/S8dnYhBycrXmXnKMhB9 u3b7zpkNVklZ8xEmNvTPGobWk6QGlnyTp10ZTfnGjU8/z0efrFKy7CrZZihcekKy LjZfrfbFvXxrnU/EhckUuix7XJGk0zh8fGC+su0JOr1d3Z/2rl49QGUMqcudVc4= =SbYd -----END PGP SIGNATURE----- --WUnMksDVq68wxC1ONISkhEosaJIXeGkeo--