Commit 6061162e authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

char: use /chardevs container instead of chardevs list 



Use object_resolve_path_component() and object_child_foreach() on
/chardevs container instead of iterating over chardevs list.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 474628e8

chardev/char.c

+36 −30
Original line number Diff line number Diff line
@@ -455,21 +455,24 @@ static const TypeInfo char_type_info = { 
 * mux will receive CHR_EVENT_OPENED notifications for the BE

 * immediately.

 */

static void muxes_realize_done(Notifier *notifier, void *unused)

static int open_muxes(Object *child, void *opaque)

{

    Chardev *chr;



    muxes_realized = true;

    QTAILQ_FOREACH(chr, &chardevs, next) {

        if (CHARDEV_IS_MUX(chr)) {

    if (CHARDEV_IS_MUX(child)) {

        /* send OPENED to all already-attached FEs */

            mux_chr_send_all_event(CHARDEV(chr), CHR_EVENT_OPENED);

        mux_chr_send_all_event(CHARDEV(child), CHR_EVENT_OPENED);

        /* mark mux as OPENED so any new FEs will immediately receive

         * OPENED event

         */

            qemu_chr_be_event(chr, CHR_EVENT_OPENED);

        qemu_chr_be_event(CHARDEV(child), CHR_EVENT_OPENED);

    }



    return 0;

}



static void muxes_realize_done(Notifier *notifier, void *unused)

{

    muxes_realized = true;

    object_child_foreach(get_chardevs_root(), open_muxes, NULL);

}



static Notifier muxes_realize_notify = {
@@ -1068,22 +1071,30 @@ void qemu_chr_fe_disconnect(CharBackend *be) 
    }

}



ChardevInfoList *qmp_query_chardev(Error **errp)

static int qmp_query_chardev_foreach(Object *obj, void *data)

{

    ChardevInfoList *chr_list = NULL;

    Chardev *chr;



    QTAILQ_FOREACH(chr, &chardevs, next) {

    Chardev *chr = CHARDEV(obj);

    ChardevInfoList **list = data;

    ChardevInfoList *info = g_malloc0(sizeof(*info));



    info->value = g_malloc0(sizeof(*info->value));

    info->value->label = g_strdup(chr->label);

    info->value->filename = g_strdup(chr->filename);

    info->value->frontend_open = chr->be && chr->be->fe_open;



        info->next = chr_list;

        chr_list = info;

    info->next = *list;

    *list = info;



    return 0;

}



ChardevInfoList *qmp_query_chardev(Error **errp)

{

    ChardevInfoList *chr_list = NULL;



    object_child_foreach(get_chardevs_root(),

                         qmp_query_chardev_foreach, &chr_list);



    return chr_list;

}
@@ -1110,14 +1121,9 @@ ChardevBackendInfoList *qmp_query_chardev_backends(Error **errp) 


Chardev *qemu_chr_find(const char *name)

{

    Chardev *chr;

    Object *obj = object_resolve_path_component(get_chardevs_root(), name);



    QTAILQ_FOREACH(chr, &chardevs, next) {

        if (strcmp(chr->label, name) != 0)

            continue;

        return chr;

    }

    return NULL;

    return obj ? CHARDEV(obj) : NULL;

}



QemuOptsList qemu_chardev_opts = {