[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly |
Date: |
Mon, 23 Jun 2014 12:36:39 -0400 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-char.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 7e4bd90..28ea9f2 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -325,7 +325,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;
@@ -347,10 +347,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;
}
@@ -385,13 +385,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);
}
}
}
@@ -416,7 +416,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.9.3
- [Qemu-devel] [PULL 10/43] qapi script: add event support, (continued)
- [Qemu-devel] [PULL 10/43] qapi script: add event support, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 09/43] qapi: add event helper functions, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 19/43] qapi event: convert RESUME, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly,
Luiz Capitulino <=
- [Qemu-devel] [PULL 37/43] qapi event: clean up, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 43/43] monitor: protect event emission, Luiz Capitulino, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Luiz Capitulino, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Eric Blake, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Peter Maydell, 2014/06/24