On 01/11/2017 11:29 AM, Marc-André Lureau wrote: > CharDriver no longer exists, it has been replaced with Chardev. > > Signed-off-by: Marc-André Lureau <[email protected]> > --- > include/sysemu/char.h | 40 ++++++++++++++++++++-------------------- > qemu-char.c | 12 ++++++------ > 2 files changed, 26 insertions(+), 26 deletions(-) >
> +++ b/qemu-char.c
> @@ -3171,13 +3171,13 @@ typedef struct {
> Chardev *chr;
> char buf[12];
> size_t buflen;
> -} TCPCharDriverTelnetInit;
> +} TCPChardevTelnetInit;
>
> static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc,
> GIOCondition cond G_GNUC_UNUSED,
> gpointer user_data)
> {
> - TCPCharDriverTelnetInit *init = user_data;
> + TCPChardevTelnetInit *init = user_data;
> ssize_t ret;
>
> ret = qio_channel_write(ioc, init->buf, init->buflen, NULL);
> @@ -3204,8 +3204,8 @@ static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc,
> static void tcp_chr_telnet_init(Chardev *chr)
> {
> SocketChardev *s = SOCKET_CHARDEV(chr);
> - TCPCharDriverTelnetInit *init =
> - g_new0(TCPCharDriverTelnetInit, 1);
> + TCPChardevTelnetInit *init =
> + g_new0(TCPChardevTelnetInit, 1);
This would fit within 80 columns on one line; but I'm also okay if you
don't bother with those sorts of cleanups.
Reviewed-by: Eric Blake <[email protected]>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
