From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuc3L-0005dM-CR for qemu-devel@nongnu.org; Wed, 11 Jun 2014 02:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wuc3F-0001mI-4m for qemu-devel@nongnu.org; Wed, 11 Jun 2014 02:30:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuc3E-0001mA-TI for qemu-devel@nongnu.org; Wed, 11 Jun 2014 02:30:25 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5B6UN86015459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Jun 2014 02:30:23 -0400 Date: Wed, 11 Jun 2014 14:30:40 +0800 From: Fam Zheng Message-ID: <20140611063040.GE5448@T430.nay.redhat.com> References: <1401813551-6667-1-git-send-email-pbonzini@redhat.com> <1401813551-6667-3-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1401813551-6667-3-git-send-email-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/6] qemu-char: do not call chr_write directly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: kwolf@redhat.com, kraxel@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, lcapitulino@redhat.com On Tue, 06/03 18:39, Paolo Bonzini wrote: > Make the mux always go through qemu_chr_fe_write, so that we'll get > the mutex for the underlying chardev. > > Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng > --- > qemu-char.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/qemu-char.c b/qemu-char.c > index 3df5db7..2bda2fb 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -279,7 +279,7 @@ static int mux_chr_write(CharDriverState *chr, const uint8_t *buf, int len) > MuxDriver *d = chr->opaque; > int ret; > if (!d->timestamps) { > - ret = d->drv->chr_write(d->drv, buf, len); > + ret = qemu_chr_fe_write(d->drv, buf, len); > } else { > int i; > > @@ -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); > if (buf[i] == '\n') { > d->linestart = 1; > } > @@ -339,13 +339,13 @@ static void mux_print_help(CharDriverState *chr) > "\n\rEscape-Char set to Ascii: 0x%02x\n\r\n\r", > term_escape_char); > } > - chr->chr_write(chr, (uint8_t *)cbuf, strlen(cbuf)); > + qemu_chr_fe_write(chr, (uint8_t *)cbuf, strlen(cbuf)); > for (i = 0; mux_help[i] != NULL; i++) { > for (j=0; mux_help[i][j] != '\0'; j++) { > if (mux_help[i][j] == '%') > - chr->chr_write(chr, (uint8_t *)ebuf, strlen(ebuf)); > + qemu_chr_fe_write(chr, (uint8_t *)ebuf, strlen(ebuf)); > else > - chr->chr_write(chr, (uint8_t *)&mux_help[i][j], 1); > + qemu_chr_fe_write(chr, (uint8_t *)&mux_help[i][j], 1); > } > } > } > @@ -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; > } > -- > 1.8.3.1 > >