From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrrkO-00016L-Cb for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wrrk9-0007Vy-C2 for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:39:36 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:45653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wrrk9-0007UE-4y for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:39:21 -0400 Received: by mail-wi0-f169.google.com with SMTP id hi2so6373657wib.0 for ; Tue, 03 Jun 2014 09:39:20 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Jun 2014 18:39:07 +0200 Message-Id: <1401813551-6667-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1401813551-6667-1-git-send-email-pbonzini@redhat.com> References: <1401813551-6667-1-git-send-email-pbonzini@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, kraxel@redhat.com, stefanha@redhat.com, lcapitulino@redhat.com 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 --- 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