| Message ID | 20241014152408.427700-4-r.peniaev@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | chardev/mux: implement frontend detach | expand |
Reviewed-by: Clément Mathieu--Drif <clement.mathieu--drif@eviden.com> On 14/10/2024 17:24, Roman Penyaev wrote: > Caution: External email. Do not open attachments or click links, unless this email comes from a known sender and you know the content is safe. > > > Those are boolean variables, not signed integers. > > Signed-off-by: Roman Penyaev <r.peniaev@gmail.com> > Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> > Cc: qemu-devel@nongnu.org > --- > chardev/char-mux.c | 10 +++++----- > chardev/chardev-internal.h | 4 ++-- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/chardev/char-mux.c b/chardev/char-mux.c > index ee2d47b20d9b..728596c6f346 100644 > --- a/chardev/char-mux.c > +++ b/chardev/char-mux.c > @@ -73,11 +73,11 @@ static int mux_chr_write(Chardev *chr, const uint8_t *buf, int len) > * qemu_chr_fe_write and background I/O callbacks */ > qemu_chr_fe_write_all(&d->chr, > (uint8_t *)buf1, strlen(buf1)); > - d->linestart = 0; > + d->linestart = false; > } > ret += qemu_chr_fe_write(&d->chr, buf + i, 1); > if (buf[i] == '\n') { > - d->linestart = 1; > + d->linestart = true; > } > } > } > @@ -145,7 +145,7 @@ static void mux_chr_be_event(Chardev *chr, QEMUChrEvent event) > static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) > { > if (d->term_got_escape) { > - d->term_got_escape = 0; > + d->term_got_escape = false; > if (ch == term_escape_char) { > goto send_char; > } > @@ -175,11 +175,11 @@ static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) > case 't': > d->timestamps = !d->timestamps; > d->timestamps_start = -1; > - d->linestart = 0; > + d->linestart = false; > break; > } > } else if (ch == term_escape_char) { > - d->term_got_escape = 1; > + d->term_got_escape = true; > } else { > send_char: > return 1; > diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h > index c3024b51fdda..975c16de803e 100644 > --- a/chardev/chardev-internal.h > +++ b/chardev/chardev-internal.h > @@ -39,7 +39,7 @@ struct MuxChardev { > CharBackend chr; > int focus; > int mux_cnt; > - int term_got_escape; > + bool term_got_escape; > /* Intermediate input buffer catches escape sequences even if the > currently active device is not accepting any input - but only until it > is full as well. */ > @@ -49,7 +49,7 @@ struct MuxChardev { > int timestamps; > > /* Protected by the Chardev chr_write_lock. */ > - int linestart; > + bool linestart; > int64_t timestamps_start; > }; > typedef struct MuxChardev MuxChardev; > -- > 2.34.1 > >
diff --git a/chardev/char-mux.c b/chardev/char-mux.c index ee2d47b20d9b..728596c6f346 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -73,11 +73,11 @@ static int mux_chr_write(Chardev *chr, const uint8_t *buf, int len) * qemu_chr_fe_write and background I/O callbacks */ qemu_chr_fe_write_all(&d->chr, (uint8_t *)buf1, strlen(buf1)); - d->linestart = 0; + d->linestart = false; } ret += qemu_chr_fe_write(&d->chr, buf + i, 1); if (buf[i] == '\n') { - d->linestart = 1; + d->linestart = true; } } } @@ -145,7 +145,7 @@ static void mux_chr_be_event(Chardev *chr, QEMUChrEvent event) static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) { if (d->term_got_escape) { - d->term_got_escape = 0; + d->term_got_escape = false; if (ch == term_escape_char) { goto send_char; } @@ -175,11 +175,11 @@ static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) case 't': d->timestamps = !d->timestamps; d->timestamps_start = -1; - d->linestart = 0; + d->linestart = false; break; } } else if (ch == term_escape_char) { - d->term_got_escape = 1; + d->term_got_escape = true; } else { send_char: return 1; diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h index c3024b51fdda..975c16de803e 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h @@ -39,7 +39,7 @@ struct MuxChardev { CharBackend chr; int focus; int mux_cnt; - int term_got_escape; + bool term_got_escape; /* Intermediate input buffer catches escape sequences even if the currently active device is not accepting any input - but only until it is full as well. */ @@ -49,7 +49,7 @@ struct MuxChardev { int timestamps; /* Protected by the Chardev chr_write_lock. */ - int linestart; + bool linestart; int64_t timestamps_start; }; typedef struct MuxChardev MuxChardev;
Those are boolean variables, not signed integers. Signed-off-by: Roman Penyaev <r.peniaev@gmail.com> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> Cc: qemu-devel@nongnu.org --- chardev/char-mux.c | 10 +++++----- chardev/chardev-internal.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)