Commit dd1559bb authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'elmarco/tags/chr-tests-pull-request' into staging 



# gpg: Signature made Thu 04 May 2017 12:42:10 PM BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* elmarco/tags/chr-tests-pull-request: (21 commits)
  tests: add /char/console test
  tests: add /char/udp test
  tests: add /char/socket test
  tests: add /char/file test
  tests: add /char/pipe test
  tests: add alias check in /char/ringbuf
  char-udp: flush as much buffer as possible
  char-socket: add 'connected' property
  char-socket: add 'addr' property
  char-socket: update local address after listen
  char-socket: introduce update_disconnected_filename()
  char: useless NULL check
  char: remove chardevs list
  char: remove qemu_chardev_add
  char: use /chardevs container instead of chardevs list
  vl: add todo note about root container cleanup
  char: add a /chardevs container
  container: don't leak container reference
  xen: use a better chardev type check
  mux: simplfy muxes_realize_done
  ...

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents f03f9f0c 79c8db5a

chardev/char-mux.c

+8 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void mux_print_help(Chardev *chr) 
    }

}



void mux_chr_send_event(MuxChardev *d, int mux_nr, int event)

static void mux_chr_send_event(MuxChardev *d, int mux_nr, int event)

{

    CharBackend *be = d->backends[mux_nr];
@@ -222,9 +222,9 @@ static void mux_chr_read(void *opaque, const uint8_t *buf, int size) 


bool muxes_realized;



static void mux_chr_event(void *opaque, int event)

void mux_chr_send_all_event(Chardev *chr, int event)

{

    MuxChardev *d = MUX_CHARDEV(opaque);

    MuxChardev *d = MUX_CHARDEV(chr);

    int i;



    if (!muxes_realized) {
@@ -237,6 +237,11 @@ static void mux_chr_event(void *opaque, int event) 
    }

}



static void mux_chr_event(void *opaque, int event)

{

    mux_chr_send_all_event(CHARDEV(opaque), event);

}



static GSource *mux_chr_add_watch(Chardev *s, GIOCondition cond)

{

    MuxChardev *d = MUX_CHARDEV(s);

chardev/char-mux.h

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ typedef struct MuxChardev { 


void mux_chr_set_handlers(Chardev *chr, GMainContext *context);

void mux_set_focus(Chardev *chr, int focus);

void mux_chr_send_event(MuxChardev *d, int mux_nr, int event);

void mux_chr_send_all_event(Chardev *chr, int event);



#endif /* CHAR_MUX_H */

chardev/char-pty.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static gboolean qemu_chr_be_generic_open_func(gpointer opaque) 
    PtyChardev *s = PTY_CHARDEV(opaque);



    s->open_tag = 0;

    qemu_chr_be_generic_open(chr);

    qemu_chr_be_event(chr, CHR_EVENT_OPENED);

    return FALSE;

}

chardev/char-socket.c

+41 −5
Original line number Diff line number Diff line
@@ -385,6 +385,15 @@ static char *SocketAddress_to_str(const char *prefix, SocketAddress *addr, 
    }

}



static void update_disconnected_filename(SocketChardev *s)

{

    Chardev *chr = CHARDEV(s);



    g_free(chr->filename);

    chr->filename = SocketAddress_to_str("disconnected:", s->addr,

                                         s->is_listen, s->is_telnet);

}



static void tcp_chr_disconnect(Chardev *chr)

{

    SocketChardev *s = SOCKET_CHARDEV(chr);
@@ -399,8 +408,7 @@ static void tcp_chr_disconnect(Chardev *chr) 
        s->listen_tag = qio_channel_add_watch(

            QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);

    }

    chr->filename = SocketAddress_to_str("disconnected:", s->addr,

                                         s->is_listen, s->is_telnet);

    update_disconnected_filename(s);

    qemu_chr_be_event(chr, CHR_EVENT_CLOSED);

    if (s->reconnect_time) {

        qemu_chr_socket_restart_timer(chr);
@@ -508,7 +516,7 @@ static void tcp_chr_connect(void *opaque) 
                                           tcp_chr_read,

                                           chr, NULL);

    }

    qemu_chr_be_generic_open(chr);

    qemu_chr_be_event(chr, CHR_EVENT_OPENED);

}



static void tcp_chr_update_read_handler(Chardev *chr,
@@ -908,8 +916,7 @@ static void qmp_chardev_open_socket(Chardev *chr, 
    /* be isn't opened until we get a connection */

    *be_opened = false;



    chr->filename = SocketAddress_to_str("disconnected:",

                                         addr, is_listen, is_telnet);

    update_disconnected_filename(s);



    if (is_listen) {

        if (is_telnet || is_tn3270) {
@@ -937,6 +944,11 @@ static void qmp_chardev_open_socket(Chardev *chr, 
            if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) {

                goto error;

            }



            qapi_free_SocketAddress(s->addr);

            s->addr = socket_local_address(sioc->fd, errp);

            update_disconnected_filename(s);



            s->listen_ioc = sioc;

            if (is_waitconnect &&

                qemu_chr_wait_connected(chr, errp) < 0) {
@@ -1033,6 +1045,23 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
    sock->addr = addr;

}



static void

char_socket_get_addr(Object *obj, Visitor *v, const char *name,

                     void *opaque, Error **errp)

{

    SocketChardev *s = SOCKET_CHARDEV(obj);



    visit_type_SocketAddress(v, name, &s->addr, errp);

}



static bool

char_socket_get_connected(Object *obj, Error **errp)

{

    SocketChardev *s = SOCKET_CHARDEV(obj);



    return s->connected;

}



static void char_socket_class_init(ObjectClass *oc, void *data)

{

    ChardevClass *cc = CHARDEV_CLASS(oc);
@@ -1048,6 +1077,13 @@ static void char_socket_class_init(ObjectClass *oc, void *data) 
    cc->chr_add_client = tcp_chr_add_client;

    cc->chr_add_watch = tcp_chr_add_watch;

    cc->chr_update_read_handler = tcp_chr_update_read_handler;



    object_class_property_add(oc, "addr", "SocketAddress",

                              char_socket_get_addr, NULL,

                              NULL, NULL, &error_abort);



    object_class_property_add_bool(oc, "connected", char_socket_get_connected,

                                   NULL, &error_abort);

}



static const TypeInfo char_socket_type_info = {

chardev/char-udp.c

+15 −11
Original line number Diff line number Diff line
@@ -51,6 +51,18 @@ static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len) 
        s->ioc, (const char *)buf, len, NULL);

}



static void udp_chr_flush_buffer(UdpChardev *s)

{

    Chardev *chr = CHARDEV(s);



    while (s->max_size > 0 && s->bufptr < s->bufcnt) {

        int n = MIN(s->max_size, s->bufcnt - s->bufptr);

        qemu_chr_be_write(chr, &s->buf[s->bufptr], n);

        s->bufptr += n;

        s->max_size = qemu_chr_be_can_write(chr);

    }

}



static int udp_chr_read_poll(void *opaque)

{

    Chardev *chr = CHARDEV(opaque);
@@ -61,11 +73,8 @@ static int udp_chr_read_poll(void *opaque) 
    /* If there were any stray characters in the queue process them

     * first

     */

    while (s->max_size > 0 && s->bufptr < s->bufcnt) {

        qemu_chr_be_write(chr, &s->buf[s->bufptr], 1);

        s->bufptr++;

        s->max_size = qemu_chr_be_can_write(chr);

    }

    udp_chr_flush_buffer(s);



    return s->max_size;

}
@@ -85,13 +94,8 @@ static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) 
        return FALSE;

    }

    s->bufcnt = ret;



    s->bufptr = 0;

    while (s->max_size > 0 && s->bufptr < s->bufcnt) {

        qemu_chr_be_write(chr, &s->buf[s->bufptr], 1);

        s->bufptr++;

        s->max_size = qemu_chr_be_can_write(chr);

    }

    udp_chr_flush_buffer(s);



    return TRUE;

}