Commit 9ac3788b authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

char: add a QEMU_CHAR_FEATURE_GCONTEXT flag 



QEMU_CHAR_FEATURE_GCONTEXT declares the character device can switch
GMainContext.

Assert we don't switch context when the character device doesn't
provide this feature.  Character device users must not violate this
restriction.  In particular, user configurations that violate them
must be rejected.

Existing frontend that rely on context switching would now assert() if
the backend doesn't allow it (instead of silently producing undesired
events in the default context). Following patches improve the
situation by reporting an error earlier instead, on the frontend side.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181205203737.9011-4-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent ef12a703

chardev/char.c

+11 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ void qemu_chr_be_update_read_handlers(Chardev *s, 
{

    ChardevClass *cc = CHARDEV_GET_CLASS(s);



    assert(qemu_chr_has_feature(s, QEMU_CHAR_FEATURE_GCONTEXT)

           || !context);

    s->gcontext = context;

    if (cc->chr_update_read_handler) {

        cc->chr_update_read_handler(s);
@@ -240,6 +242,15 @@ static void char_init(Object *obj) 


    chr->logfd = -1;

    qemu_mutex_init(&chr->chr_write_lock);



    /*

     * Assume if chr_update_read_handler is implemented it will

     * take the updated gcontext into account.

     */

    if (CHARDEV_GET_CLASS(chr)->chr_update_read_handler) {

        qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT);

    }



}



static int null_chr_write(Chardev *chr, const uint8_t *buf, int len)

include/chardev/char.h

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ typedef enum { 
    QEMU_CHAR_FEATURE_FD_PASS,

    /* Whether replay or record mode is enabled */

    QEMU_CHAR_FEATURE_REPLAY,

    /* Whether the gcontext can be changed after calling

     * qemu_chr_be_update_read_handlers() */

    QEMU_CHAR_FEATURE_GCONTEXT,



    QEMU_CHAR_FEATURE_LAST,

} ChardevFeature;