From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiOZL-000226-4s for qemu-devel@nongnu.org; Fri, 31 May 2013 08:36:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiOZJ-0000zr-RL for qemu-devel@nongnu.org; Fri, 31 May 2013 08:36:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiOZJ-0000zk-I5 for qemu-devel@nongnu.org; Fri, 31 May 2013 08:36:29 -0400 Message-ID: <51A89949.6040002@redhat.com> Date: Fri, 31 May 2013 06:36:25 -0600 From: Eric Blake MIME-Version: 1.0 References: <1369722844-24345-1-git-send-email-kraxel@redhat.com> <1369722844-24345-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1369722844-24345-3-git-send-email-kraxel@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2JVNEDPCNPUHVOTWMINUG" Subject: Re: [Qemu-devel] [PATCH 2/2] chardev: fix "info chardev" output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Anthony Liguori , Peter Krempa , qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2JVNEDPCNPUHVOTWMINUG Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 05/28/2013 12:34 AM, Gerd Hoffmann wrote: > Fill unset CharDriverState->filename with the backend name, so > 'info chardev' will return at least the chardev type. Don't > touch it in case the chardev init function filled it already, > like the socket+pty chardevs do for example. >=20 > Signed-off-by: Gerd Hoffmann > --- > qemu-char.c | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/qemu-char.c b/qemu-char.c > index f825294..d04b429 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -3801,6 +3801,9 @@ ChardevReturn *qmp_chardev_add(const char *id, Ch= ardevBackend *backend, > chr->label =3D g_strdup(id); > chr->avail_connections =3D > (backend->kind =3D=3D CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX = : 1; > + if (!chr->filename) { > + chr->filename =3D g_strdup(ChardevBackendKind_lookup[backe= nd->kind]); > + } > QTAILQ_INSERT_TAIL(&chardevs, chr, next); > return ret; > } else { >=20 Peter was telling me on IRC that this patch is still broken with regards to libvirt; I've cc'd him to provide more details... --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org ------enig2JVNEDPCNPUHVOTWMINUG 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.4.13 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJRqJlJAAoJEKeha0olJ0NqL9oH/R/DUHid+WTOs80GxoeZgyKF IAQRYL3bQdxeGFWU8yembrXPlyiBzjkwvBu25FTLNHJNK0/G268MABfeia7/UtRh IK05vfeicqBuc2vSKFCdzJ8kLKmlnhoPLEqz/l9Yx4nCG3QK2127LBXEKTGNIaRh Ik3rUokc9cyDIYuiPf+pZ4g90pj7dSFLP+YioLREguj7+dtfd837q2fk1L5PEYFx KfQt0nMhjtbIqGk7afbKrgcXdsw0ydWxvM1ebgDvmsDE0PS5lV/+SJJ3lkzK4blv tJgMgqUvY9X71lr4rL18biKaTGXqe5r0OB7T8+eLiZHHNYzQoUx6MtBDaDwBl1k= =F1dr -----END PGP SIGNATURE----- ------enig2JVNEDPCNPUHVOTWMINUG--