Commit 139a4b63 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/chardev.5' into staging 



* kraxel/chardev.5:
  spice-qemu-char: Remove dead debugging code
  spice-qemu-char: Fix name parameter issues after qapi-ifying
  qemu-char.c: fix waiting for telnet connection message
  Revert "hmp: Disable chardev-add and chardev-remove"
  chardev: add udp support to qapi
  chardev: add memory (ringbuf) support to qapi
  chardev: add vc support to qapi
  chardev: add spice support to qapi
  chardev: add pipe support to qapi
  chardev: add console support to qapi
  chardev: switch pty init to qapi
  chardev: switch parallel init to qapi
  chardev: switch serial/tty init to qapi
  chardev: add stdio support to qapi
  chardev: switch file init to qapi
  chardev: add braille support to qapi
  chardev: add msmouse support to qapi
  chardev: switch null init to qapi
  chardev: add mux chardev support to qapi
  chardev: add support for qapi-based chardev initialization

Conflicts:
	ui/console.c

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 3d34a411 344bf1e9

backends/baum.c

+2 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void baum_close(struct CharDriverState *chr) 
    g_free(baum);

}



static CharDriverState *chr_baum_init(QemuOpts *opts)

CharDriverState *chr_baum_init(void)

{

    BaumDriverState *baum;

    CharDriverState *chr;
@@ -627,7 +627,7 @@ fail_handle: 


static void register_types(void)

{

    register_char_driver("braille", chr_baum_init);

    register_char_driver_qapi("braille", CHARDEV_BACKEND_KIND_BRAILLE, NULL);

}



type_init(register_types);

backends/msmouse.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void msmouse_chr_close (struct CharDriverState *chr) 
    g_free (chr);

}



static CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts)

CharDriverState *qemu_chr_open_msmouse(void)

{

    CharDriverState *chr;
@@ -78,7 +78,7 @@ static CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts) 


static void register_types(void)

{

    register_char_driver("msmouse", qemu_chr_open_msmouse);

    register_char_driver_qapi("msmouse", CHARDEV_BACKEND_KIND_MSMOUSE, NULL);

}



type_init(register_types);

hmp-commands.hx

+31 −32
Original line number Diff line number Diff line
@@ -1522,38 +1522,37 @@ passed since 1970, i.e. unix epoch. 
@end table

ETEXI



HXCOMM Disabled for now, because it isn't built on top of QMP's chardev-add

HXCOMM     {

HXCOMM         .name       = "chardev-add",

HXCOMM         .args_type  = "args:s",

HXCOMM         .params     = "args",

HXCOMM         .help       = "add chardev",

HXCOMM         .mhandler.cmd = hmp_chardev_add,

HXCOMM     },

HXCOMM

HXCOMM STEXI

HXCOMM @item chardev_add args

HXCOMM @findex chardev_add

HXCOMM

HXCOMM chardev_add accepts the same parameters as the -chardev command line switch.

HXCOMM

HXCOMM ETEXI

HXCOMM

HXCOMM     {

HXCOMM         .name       = "chardev-remove",

HXCOMM         .args_type  = "id:s",

HXCOMM         .params     = "id",

HXCOMM         .help       = "remove chardev",

HXCOMM         .mhandler.cmd = hmp_chardev_remove,

HXCOMM     },

HXCOMM

HXCOMM STEXI

HXCOMM @item chardev_remove id

HXCOMM @findex chardev_remove

HXCOMM

HXCOMM Removes the chardev @var{id}.

HXCOMM

HXCOMM ETEXI

    {

        .name       = "chardev-add",

        .args_type  = "args:s",

        .params     = "args",

        .help       = "add chardev",

        .mhandler.cmd = hmp_chardev_add,

    },



STEXI

@item chardev_add args

@findex chardev_add



chardev_add accepts the same parameters as the -chardev command line switch.



ETEXI



    {

        .name       = "chardev-remove",

        .args_type  = "id:s",

        .params     = "id",

        .help       = "remove chardev",

        .mhandler.cmd = hmp_chardev_remove,

    },



STEXI

@item chardev_remove id

@findex chardev_remove



Removes the chardev @var{id}.



ETEXI



    {

        .name       = "info",

include/char/char.h

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ CharDriverState *qemu_chr_find(const char *name); 
QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename);



void register_char_driver(const char *name, CharDriverState *(*open)(QemuOpts *));

void register_char_driver_qapi(const char *name, int kind,

        void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp));



/* add an eventfd to the qemu devices that are polled */

CharDriverState *qemu_chr_open_eventfd(int eventfd);
@@ -259,4 +261,10 @@ size_t qemu_chr_mem_osize(const CharDriverState *chr); 


CharDriverState *qemu_char_get_next_serial(void);



/* msmouse */

CharDriverState *qemu_chr_open_msmouse(void);



/* baum.c */

CharDriverState *chr_baum_init(void);



#endif

include/qemu/sockets.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ SocketAddress *socket_parse(const char *str, Error **errp); 
int socket_connect(SocketAddress *addr, Error **errp,

                   NonBlockingConnectHandler *callback, void *opaque);

int socket_listen(SocketAddress *addr, Error **errp);

int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);



/* Old, ipv4 only bits.  Don't use for new code. */

int parse_host_port(struct sockaddr_in *saddr, const char *str);