On Tue, May 9, 2017 at 3:42 PM Marc-André Lureau < marcandre.lur...@redhat.com> wrote:
> Avoid accessing CharBackend directly, use qemu_chr_be_* methods instead. > > be->chr_read should exists if qemu_chr_be_can_write() is true. > > (use qemu_chr_be_write(), _impl() bypasses replay) > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > hw/bt/hci-csr.c | 9 +++------ > No maintainer for this file. Andrzej, as author of the file, can you review? > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c > index 0f2021086d..d13192b9b5 100644 > --- a/hw/bt/hci-csr.c > +++ b/hw/bt/hci-csr.c > @@ -82,17 +82,14 @@ enum { > > static inline void csrhci_fifo_wake(struct csrhci_s *s) > { > - Chardev *chr = (Chardev *)s; > - CharBackend *be = chr->be; > + Chardev *chr = CHARDEV(s); > > if (!s->enable || !s->out_len) > return; > > /* XXX: Should wait for s->modem_state & CHR_TIOCM_RTS? */ > - if (be && be->chr_can_read && be->chr_can_read(be->opaque) && > - be->chr_read) { > - be->chr_read(be->opaque, > - s->outfifo + s->out_start++, 1); > + if (qemu_chr_be_can_write(chr)) { > + qemu_chr_be_write(chr, s->outfifo + s->out_start++, 1); > s->out_len--; > if (s->out_start >= s->out_size) { > s->out_start = 0; > -- > 2.13.0.rc1.16.gd80b50c3f > > > -- Marc-André Lureau