Commit 3aef23d7 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

char: replace avail_connections 



No need to count the users of a CharDriverState, it can rely on the fact
of whether there is a CharBackend associated or if there is enough space
in the muxer.

Simplify and fold chr_mux_new_fe() in qemu_chr_fe_init() since there is
a single user now. Also switch from fprintf to raising error instead.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20161022100951.19562-5-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 58fa5494

hw/bt/hci-csr.c

+0 −1
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ CharDriverState *uart_hci_init(void) 
    s->chr.opaque = s;

    s->chr.chr_write = csrhci_write;

    s->chr.chr_ioctl = csrhci_ioctl;

    s->chr.avail_connections = 1;



    s->hci = qemu_next_hci();

    s->hci->opaque = s;

include/sysemu/char.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct CharDriverState { 
    int logfd;

    int be_open;

    int explicit_be_open;

    int avail_connections;

    int is_mux;

    guint fd_in_tag;

    bool replay;

qemu-char.c

+13 −21
Original line number Diff line number Diff line
@@ -808,20 +808,6 @@ static void mux_chr_free(struct CharDriverState *chr) 
    g_free(d);

}



static int mux_chr_new_fe(CharDriverState *chr, CharBackend *be, Error **errp)

{

    MuxDriver *d = chr->opaque;



    if (d->mux_cnt >= MAX_MUX) {

        fprintf(stderr, "Cannot add I/O handlers, MUX array is full\n");

        return -1;

    }



    d->backends[d->mux_cnt] = be;



    return d->mux_cnt++;

}



static void mux_chr_set_handlers(CharDriverState *chr, GMainContext *context)

{

    MuxDriver *d = chr->opaque;
@@ -902,10 +888,16 @@ bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s, Error **errp) 
    int tag = 0;



    if (s->is_mux) {

        tag = mux_chr_new_fe(s, b, errp);

        if (tag < 0) {

            return false;

        MuxDriver *d = s->opaque;



        if (d->mux_cnt >= MAX_MUX) {

            goto unavailable;

        }



        d->backends[d->mux_cnt] = b;

        tag = d->mux_cnt++;

    } else if (s->be) {

        goto unavailable;

    } else {

        s->be = b;

    }
@@ -913,8 +905,11 @@ bool qemu_chr_fe_init(CharBackend *b, CharDriverState *s, Error **errp) 
    b->fe_open = false;

    b->tag = tag;

    b->chr = s;



    return true;



unavailable:

    error_setg(errp, QERR_DEVICE_IN_USE, s->label);

    return false;

}



static bool qemu_chr_is_busy(CharDriverState *s)
@@ -933,7 +928,6 @@ void qemu_chr_fe_deinit(CharBackend *b) 


    if (b->chr) {

        qemu_chr_fe_set_handlers(b, NULL, NULL, NULL, NULL, NULL, true);

        b->chr->avail_connections++;

        b->chr->be = NULL;

        if (b->chr->is_mux) {

            MuxDriver *d = b->chr->opaque;
@@ -4782,8 +4776,6 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, 
    }



    chr->label = g_strdup(id);

    chr->avail_connections =

        (backend->type == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1;

    if (!chr->filename) {

        chr->filename = g_strdup(ChardevBackendKind_lookup[backend->type]);

    }