haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qemu-char: do not call chr_write directly

Browse source 
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 <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-18 08:43:56 +02:00 committed by Luiz Capitulino
parent db39fcf1f6
commit 6975b713e6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qemu-char.c
View file

@ -325,7 +325,7 @@ static int mux_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
MuxDriver *d = chr->opaque; MuxDriver *d = chr->opaque;
int ret; int ret;
if (!d->timestamps) { if (!d->timestamps) {
ret = d->drv->chr_write(d->drv, buf, len); ret = qemu_chr_fe_write(d->drv, buf, len);
} else { } else {
int i; int i;
@ -347,10 +347,10 @@ static int mux_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
(secs / 60) % 60, (secs / 60) % 60,
secs % 60, secs % 60,
(int)(ti % 1000)); (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; 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') { if (buf[i] == '\n') {
d->linestart = 1; 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", "\n\rEscape-Char set to Ascii: 0x%02x\n\r\n\r",
term_escape_char); 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 (i = 0; mux_help[i] != NULL; i++) {
for (j=0; mux_help[i][j] != '\0'; j++) { for (j=0; mux_help[i][j] != '\0'; j++) {
if (mux_help[i][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 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': case 'x':
{ {
const char *term = "QEMU: Terminated\n\r"; 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); exit(0);
break; break;
} }