On 06/18/2014 12:43 AM, Paolo Bonzini wrote: > Make the mux always go through qemu_chr_fe_write, so that we'll get > the mutex for the underlying chardev. > > Reviewed-by: Fam Zheng <f...@redhat.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > qemu-char.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
> @@ -301,10 +301,10 @@ static int mux_chr_write(CharDriverState *chr, const
> uint8_t *buf, int len)
> (secs / 60) % 60,
> secs % 60,
> (int)(ti % 1000));
> - d->drv->chr_write(d->drv, (uint8_t *)buf1, strlen(buf1));
> + qemu_chr_fe_write(d->drv, (uint8_t *)buf1, strlen(buf1));
> d->linestart = 0;
> }
> - ret += d->drv->chr_write(d->drv, buf+i, 1);
> + ret += qemu_chr_fe_write(d->drv, buf+i, 1);
Worth fixing the spacing around + while at it?
> @@ -370,7 +370,7 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver
> *d, int ch)
> case 'x':
> {
> const char *term = "QEMU: Terminated\n\r";
> - chr->chr_write(chr,(uint8_t *)term,strlen(term));
> + qemu_chr_fe_write(chr, (uint8_t *)term, strlen(term));
> exit(0);
> break;
The break is dead code; you could clean it up while in the area.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
