chardev: qapi conversion continued
Hi,
v3 of this series. Rebased to latest master, picked up a fix from Igor, fixed a tyops in the udp commit message. No changes in the actual code and in the qapi interface.
The plumbing has changed quite a bit though as the chardev backend table has been replaced by a backend driver registration mechanism.
cheers,
Gerd
The following changes since commit fe3cc14fd83e0c8f376d849ccd0fc3433388442d:
Merge remote-tracking branch 'quintela/migration.next' into staging (2013-03-11 08:30:34 -0500)
are available in the git repository at:
git://git.kraxel.org/qemu chardev.3
for you to fetch changes up to 4f341ecd65a181e204bd9e083945e8c46781957a:
qemu-char.c: fix waiting for telnet connection message (2013-03-12 09:49:09 +0100)
----------------------------------------------------------------
Gerd Hoffmann (18):
chardev: add support for qapi-based chardev initialization
chardev: add mux chardev support to qapi
chardev: switch null init to qapi
chardev: add msmouse support to qapi
chardev: add braille support to qapi
chardev: switch file init to qapi
chardev: add stdio support to qapi
chardev: switch serial/tty init to qapi
chardev: switch parallel init to qapi
chardev: switch pty init to qapi
chardev: add console support to qapi
chardev: add pipe support to qapi
chardev: add spice support to qapi
chardev: add vc support to qapi
[fixup] vc
chardev: add memory (ringbuf) support to qapi
chardev: add udp support to qapi
Revert "hmp: Disable chardev-add and chardev-remove"
Igor Mitsyanko (1):
qemu-char.c: fix waiting for telnet connection message
backends/baum.c | 4 +- backends/msmouse.c | 4 +- hmp-commands.hx | 63 ++++---- include/char/char.h | 8 + include/qemu/sockets.h | 1 + include/ui/console.h | 4 +- include/ui/qemu-spice.h | 7 +- qapi-schema.json | 104 ++++++++++++- qemu-char.c | 381 ++++++++++++++++++++++++++++++----------------- spice-qemu-char.c | 62 +++++--- ui/console.c | 61 ++++++-- ui/gtk.c | 2 +- util/qemu-sockets.c | 25 ++++ 13 files changed, 515 insertions(+), 211 deletions(-)
PATCH 1/19 chardev: add support for qapi-based chardev initialization
This patch add support for a new way to initialize chardev devices. Instead of calling a initialization function with a QemuOpts we will now create a (qapi) ChardevBackend, optionally call a function to fill ChardevBackend from QemuOpts, then go create the chardev using the new qapi code path which is also used by chardev-add.
--- include/char/char.h | 2 ++ qemu-char.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)
include/char/char.h +2 -0
@@ -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);
qemu-char.c +43 -0
62 lines not on this page · raw message
Signature · 1 line
1.7.9.7
PATCH 2/19 chardev: add mux chardev support to qapi
In reply to Gerd HoffmannThis adds mux chardev support to the qapi and also makes the qapi-based chardev creation path handle the "mux=on" option correctly.
--- qapi-schema.json | 14 +++++++++++++- qemu-char.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-)
qapi-schema.json +13 -1
@@ -3185,6 +3185,17 @@ '*telnet' : 'bool' } } ## +# @ChardevMux: +# +# Configuration info for mux chardevs. +# +# @chardev: name of the base chardev. +# +# Since: 1.5 +## +{ 'type': 'ChardevMux', 'data': { 'chardev' : 'str' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend.
@@ -3198,7 +3209,8 @@ 'parallel': 'ChardevHostdev', 'socket' : 'ChardevSocket', 'pty' : 'ChardevDummy', - 'null' : 'ChardevDummy' } } + 'null' : 'ChardevDummy', + 'mux' : 'ChardevMux' } } ## # @ChardevReturn:
qemu-char.c +32 -3
@@ -3249,6 +3249,11 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,ChardevBackend *backend =g_new0 (ChardevBackend,1 );ChardevReturn *ret =NULL ;const char *id =qemu_opts_id (opts); +const char *bid =NULL ; + +if (qemu_opt_get_bool (opts,"mux" ,0 )) { + bid =g_strdup_printf ("%s-base" , id); + } chr =NULL ; backend->kind = cd->kind;
@@ -3258,10 +3263,24 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, goto qapi_out; } } - ret =qmp_chardev_add (qemu_opts_id (opts), backend, errp); + ret =qmp_chardev_add (bid ? bid : id, backend, errp);if (error_is_set (errp)) { goto qapi_out; } + +if (bid) { +qapi_free_ChardevBackend (backend); +qapi_free_ChardevReturn (ret); + backend =g_new0 (ChardevBackend,1 ); + backend->mux =g_new0 (ChardevMux,1 ); + backend->kind =CHARDEV_BACKEND_KIND_MUX ; + backend->mux->chardev =g_strdup (bid); + ret =qmp_chardev_add (id, backend, errp); +if (error_is_set (errp)) { + goto qapi_out; + } + } + chr =qemu_chr_find (id); qapi_out:
@@ -3629,7 +3648,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, Error **errp) {ChardevReturn *ret =g_new0 (ChardevReturn,1 ); -CharDriverState *chr =NULL ; +CharDriverState *base, *chr =NULL ; chr =qemu_chr_find (id);if (chr) {
@@ -3667,6 +3686,15 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,case CHARDEV_BACKEND_KIND_NULL : chr =qemu_chr_open_null (NULL );break ; +case CHARDEV_BACKEND_KIND_MUX : + base =qemu_chr_find (backend->mux->chardev); +if (base ==NULL ) { +error_setg (errp,"mux: base chardev %s not found" , + backend->mux->chardev); +break ; + } + chr =qemu_chr_open_mux (base); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
@@ -3677,7 +3705,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, }if (chr) { chr->label =g_strdup (id); - chr->avail_connections =1 ; + chr->avail_connections = + (backend->kind ==CHARDEV_BACKEND_KIND_MUX ) ?MAX_MUX :1 ;QTAILQ_INSERT_TAIL (&chardevs, chr, next);return ret; }else {
Signature · 1 line
1.7.9.7
PATCH 3/19 chardev: switch null init to qapi
In reply to Gerd HoffmannThis patch switches over the 'null' chardev initialization to the new qapi code path.
--- qemu-char.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
qemu-char.c +3 -3
@@ -217,7 +217,7 @@ static int null_chr_write(CharDriverState *chr, const uint8_t *buf, int len)return len; } -static CharDriverState *qemu_chr_open_null (QemuOpts *opts) +static CharDriverState *qemu_chr_open_null (void ) {CharDriverState *chr;
@@ -3684,7 +3684,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, }#endif case CHARDEV_BACKEND_KIND_NULL : - chr =qemu_chr_open_null (NULL ); + chr =qemu_chr_open_null ();break ;case CHARDEV_BACKEND_KIND_MUX : base =qemu_chr_find (backend->mux->chardev);
@@ -3734,7 +3734,7 @@ void qmp_chardev_remove(const char *id, Error **errp)static void register_types (void ) { -register_char_driver ("null" , qemu_chr_open_null); +register_char_driver_qapi ("null" ,CHARDEV_BACKEND_KIND_NULL ,NULL );register_char_driver ("socket" , qemu_chr_open_socket);register_char_driver ("udp" , qemu_chr_open_udp);register_char_driver ("memory" , qemu_chr_open_ringbuf);
Signature · 1 line
1.7.9.7
PATCH 4/19 chardev: add msmouse support to qapi
In reply to Gerd HoffmannThis patch adds 'msmouse' support to qapi and also switches over the msmouse chardev initialization to the new qapi code path.
--- backends/msmouse.c | 4 ++-- include/char/char.h | 3 +++ qapi-schema.json | 3 ++- qemu-char.c | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-)
backends/msmouse.c +2 -2
@@ -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);
include/char/char.h +3 -0
@@ -261,4 +261,7 @@ size_t qemu_chr_mem_osize(const CharDriverState *chr);CharDriverState *qemu_char_get_next_serial (void ); +/* msmouse */ +CharDriverState *qemu_chr_open_msmouse (void ); +#endif
qapi-schema.json +2 -1
@@ -3210,7 +3210,8 @@ 'socket' : 'ChardevSocket', 'pty' : 'ChardevDummy', 'null' : 'ChardevDummy', - 'mux' : 'ChardevMux' } } + 'mux' : 'ChardevMux', + 'msmouse': 'ChardevDummy' } } ## # @ChardevReturn:
qemu-char.c +3 -0
@@ -3695,6 +3695,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, } chr =qemu_chr_open_mux (base);break ; +case CHARDEV_BACKEND_KIND_MSMOUSE : + chr =qemu_chr_open_msmouse (); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
Signature · 1 line
1.7.9.7
PATCH 5/19 chardev: add braille support to qapi
In reply to Gerd HoffmannThis patch adds 'braille' support to qapi and also switches over the braille chardev initialization to the new qapi code path.
--- backends/baum.c | 4 ++-- include/char/char.h | 3 +++ qapi-schema.json | 3 ++- qemu-char.c | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-)
backends/baum.c +2 -2
@@ -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);
include/char/char.h +3 -0
@@ -264,4 +264,7 @@ CharDriverState *qemu_char_get_next_serial(void);/* msmouse */ CharDriverState *qemu_chr_open_msmouse (void ); +/* baum.c */ +CharDriverState *chr_baum_init (void ); +#endif
qapi-schema.json +2 -1
@@ -3211,7 +3211,8 @@ 'pty' : 'ChardevDummy', 'null' : 'ChardevDummy', 'mux' : 'ChardevMux', - 'msmouse': 'ChardevDummy' } } + 'msmouse': 'ChardevDummy', + 'braille': 'ChardevDummy' } } ## # @ChardevReturn:
qemu-char.c +5 -0
@@ -3698,6 +3698,11 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,case CHARDEV_BACKEND_KIND_MSMOUSE : chr =qemu_chr_open_msmouse ();break ; +#ifdef CONFIG_BRLAPI +case CHARDEV_BACKEND_KIND_BRAILLE : + chr =chr_baum_init (); +break ; +#endif default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
Signature · 1 line
1.7.9.7
PATCH 6/19 chardev: switch file init to qapi
In reply to Gerd HoffmannThis patch switches over the 'file' chardev initialization to the new qapi code path.
--- qemu-char.c | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-)
qemu-char.c +15 -28
@@ -817,18 +817,6 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out)return chr; } -static CharDriverState *qemu_chr_open_file_out (QemuOpts *opts) -{ -int fd_out; - -TFR (fd_out =qemu_open (qemu_opt_get (opts,"path" ), -O_WRONLY |O_TRUNC |O_CREAT |O_BINARY ,0666 )); -if (fd_out <0 ) { -return NULL ; - } -return qemu_chr_open_fd (-1 , fd_out); -} -static CharDriverState *qemu_chr_open_pipe (QemuOpts *opts) {int fd_in, fd_out;
@@ -1965,20 +1953,6 @@ static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts)return qemu_chr_open_win_file (GetStdHandle (STD_OUTPUT_HANDLE )); } -static CharDriverState *qemu_chr_open_win_file_out (QemuOpts *opts) -{ -const char *file_out =qemu_opt_get (opts,"path" ); -HANDLE fd_out; - - fd_out =CreateFile (file_out,GENERIC_WRITE ,FILE_SHARE_READ ,NULL , -OPEN_ALWAYS ,FILE_ATTRIBUTE_NORMAL ,NULL ); -if (fd_out ==INVALID_HANDLE_VALUE ) { -return NULL ; - } - -return qemu_chr_open_win_file (fd_out); -} -static int win_stdio_write (CharDriverState *chr,const uint8_t *buf,int len) {HANDLE hStdOut =GetStdHandle (STD_OUTPUT_HANDLE );
@@ -3178,6 +3152,19 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)#endif +static void qemu_chr_parse_file_out (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ +const char *path =qemu_opt_get (opts,"path" ); + +if (path ==NULL ) { +error_setg (errp,"chardev: file: no filename given" ); +return ; + } + backend->file =g_new0 (ChardevFile,1 ); + backend->file->out =g_strdup (path); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3746,14 +3733,14 @@ static void register_types(void)register_char_driver ("socket" , qemu_chr_open_socket);register_char_driver ("udp" , qemu_chr_open_udp);register_char_driver ("memory" , qemu_chr_open_ringbuf); +register_char_driver_qapi ("file" ,CHARDEV_BACKEND_KIND_FILE , + qemu_chr_parse_file_out);#ifdef _WIN32 -register_char_driver ("file" , qemu_chr_open_win_file_out);register_char_driver ("pipe" , qemu_chr_open_win_pipe);register_char_driver ("console" , qemu_chr_open_win_con);register_char_driver ("serial" , qemu_chr_open_win);register_char_driver ("stdio" , qemu_chr_open_win_stdio);#else -register_char_driver ("file" , qemu_chr_open_file_out);register_char_driver ("pipe" , qemu_chr_open_pipe);register_char_driver ("stdio" , qemu_chr_open_stdio);#endif
Signature · 1 line
1.7.9.7
PATCH 7/19 chardev: add stdio support to qapi
In reply to Gerd HoffmannThis patch adds 'stdio' support to qapi and also switches over the stdio chardev initialization to the new qapi code path.
--- qapi-schema.json | 16 +++++++++++++++- qemu-char.c | 26 ++++++++++++++++++++------ 2 files changed, 35 insertions(+), 7 deletions(-)
qapi-schema.json +15 -1
@@ -3196,6 +3196,19 @@ { 'type': 'ChardevMux', 'data': { 'chardev' : 'str' } } ## +# @ChardevStdio: +# +# Configuration info for stdio chardevs. +# +# @signal: #optional Allow signals (such as SIGINT triggered by ^C) +# be delivered to qemu. Default: true in -nographic mode, +# false otherwise. +# +# Since: 1.5 +## +{ 'type': 'ChardevStdio', 'data': { '*signal' : 'bool' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend.
@@ -3212,7 +3225,8 @@ 'null' : 'ChardevDummy', 'mux' : 'ChardevMux', 'msmouse': 'ChardevDummy', - 'braille': 'ChardevDummy' } } + 'braille': 'ChardevDummy', + 'stdio' : 'ChardevStdio' } } ## # @ChardevReturn:
qemu-char.c +20 -6
@@ -884,7 +884,7 @@ static void qemu_chr_close_stdio(struct CharDriverState *chr)fd_chr_close (chr); } -static CharDriverState *qemu_chr_open_stdio (QemuOpts *opts) +static CharDriverState *qemu_chr_open_stdio (ChardevStdio *opts) {CharDriverState *chr;
@@ -900,8 +900,10 @@ static CharDriverState *qemu_chr_open_stdio(QemuOpts *opts) chr =qemu_chr_open_fd (0 ,1 ); chr->chr_close = qemu_chr_close_stdio; chr->chr_set_echo = qemu_chr_set_echo_stdio; - stdio_allow_signal =qemu_opt_get_bool (opts,"signal" , - display_type !=DT_NOGRAPHIC ); + stdio_allow_signal = display_type !=DT_NOGRAPHIC ; +if (opts->has_signal) { + stdio_allow_signal = opts->signal; + }qemu_chr_fe_set_echo (chr, false);return chr;
@@ -2090,7 +2092,7 @@ static void win_stdio_close(CharDriverState *chr)g_free (chr); } -static CharDriverState *qemu_chr_open_win_stdio (QemuOpts *opts) +static CharDriverState *qemu_chr_open_stdio (ChardevStdio *opts) {CharDriverState *chr;WinStdioCharState *stdio;
@@ -3165,6 +3167,15 @@ static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend, backend->file->out =g_strdup (path); } +static void qemu_chr_parse_stdio (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ + backend->stdio =g_new0 (ChardevStdio,1 ); + backend->stdio->has_signal = true; + backend->stdio->signal = +qemu_opt_get_bool (opts,"signal" , display_type !=DT_NOGRAPHIC ); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3690,6 +3701,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr =chr_baum_init ();break ;#endif +case CHARDEV_BACKEND_KIND_STDIO : + chr =qemu_chr_open_stdio (backend->stdio); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
@@ -3735,14 +3749,14 @@ static void register_types(void)register_char_driver ("memory" , qemu_chr_open_ringbuf);register_char_driver_qapi ("file" ,CHARDEV_BACKEND_KIND_FILE , qemu_chr_parse_file_out); +register_char_driver_qapi ("stdio" ,CHARDEV_BACKEND_KIND_STDIO , + qemu_chr_parse_stdio);#ifdef _WIN32register_char_driver ("pipe" , qemu_chr_open_win_pipe);register_char_driver ("console" , qemu_chr_open_win_con);register_char_driver ("serial" , qemu_chr_open_win); -register_char_driver ("stdio" , qemu_chr_open_win_stdio);#else register_char_driver ("pipe" , qemu_chr_open_pipe); -register_char_driver ("stdio" , qemu_chr_open_stdio);#endif #ifdef HAVE_CHARDEV_TTY register_char_driver ("tty" , qemu_chr_open_tty);
Signature · 1 line
1.7.9.7
PATCH 8/19 chardev: switch serial/tty init to qapi
In reply to Gerd HoffmannThis patch switches over the serial chardev initialization to the new qapi code path.
--- qemu-char.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
qemu-char.c +17 -20
@@ -1395,18 +1395,6 @@ static CharDriverState *qemu_chr_open_tty_fd(int fd) chr->chr_close = qemu_chr_close_tty; return chr; } - -static CharDriverState *qemu_chr_open_tty (QemuOpts *opts) -{ -const char *filename =qemu_opt_get (opts,"path" ); -int fd; - -TFR (fd =qemu_open (filename,O_RDWR |O_NONBLOCK )); -if (fd <0 ) { -return NULL ; - } -return qemu_chr_open_tty_fd (fd); -}#endif /* __linux__ || __sun__ */ #if defined(__linux__)
@@ -1831,11 +1819,6 @@ static CharDriverState *qemu_chr_open_win_path(const char *filename)return chr; } -static CharDriverState *qemu_chr_open_win (QemuOpts *opts) -{ -return qemu_chr_open_win_path (qemu_opt_get (opts,"path" )); -} -static int win_chr_pipe_poll (void *opaque) {CharDriverState *chr = opaque;
@@ -3176,6 +3159,19 @@ static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend,qemu_opt_get_bool (opts,"signal" , display_type !=DT_NOGRAPHIC ); } +static void qemu_chr_parse_serial (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ +const char *device =qemu_opt_get (opts,"path" ); + +if (device ==NULL ) { +error_setg (errp,"chardev: serial/tty: no device path given" ); +return ; + } + backend->serial =g_new0 (ChardevHostdev,1 ); + backend->serial->device =g_strdup (device); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3751,16 +3747,17 @@ static void register_types(void) qemu_chr_parse_file_out);register_char_driver_qapi ("stdio" ,CHARDEV_BACKEND_KIND_STDIO , qemu_chr_parse_stdio); +register_char_driver_qapi ("serial" ,CHARDEV_BACKEND_KIND_SERIAL , + qemu_chr_parse_serial); +register_char_driver_qapi ("tty" ,CHARDEV_BACKEND_KIND_SERIAL , + qemu_chr_parse_serial);#ifdef _WIN32register_char_driver ("pipe" , qemu_chr_open_win_pipe);register_char_driver ("console" , qemu_chr_open_win_con); -register_char_driver ("serial" , qemu_chr_open_win);#else register_char_driver ("pipe" , qemu_chr_open_pipe);#endif #ifdef HAVE_CHARDEV_TTY -register_char_driver ("tty" , qemu_chr_open_tty); -register_char_driver ("serial" , qemu_chr_open_tty);register_char_driver ("pty" , qemu_chr_open_pty);#endif #ifdef HAVE_CHARDEV_PARPORT
Signature · 1 line
1.7.9.7
PATCH 9/19 chardev: switch parallel init to qapi
In reply to Gerd HoffmannThis patch switches over the parallel chardev initialization to the new qapi code path.
--- qemu-char.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
qemu-char.c +17 -20
@@ -3121,22 +3121,6 @@ fail:return NULL ; } -#ifdef HAVE_CHARDEV_PARPORT - -static CharDriverState *qemu_chr_open_pp (QemuOpts *opts) -{ -const char *filename =qemu_opt_get (opts,"path" ); -int fd; - - fd =qemu_open (filename,O_RDWR ); -if (fd <0 ) { -return NULL ; - } -return qemu_chr_open_pp_fd (fd); -} - -#endif -static void qemu_chr_parse_file_out (QemuOpts *opts,ChardevBackend *backend,Error **errp) {
@@ -3172,6 +3156,19 @@ static void qemu_chr_parse_serial(QemuOpts *opts, ChardevBackend *backend, backend->serial->device =g_strdup (device); } +static void qemu_chr_parse_parallel (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ +const char *device =qemu_opt_get (opts,"path" ); + +if (device ==NULL ) { +error_setg (errp,"chardev: parallel: no device path given" ); +return ; + } + backend->parallel =g_new0 (ChardevHostdev,1 ); + backend->parallel->device =g_strdup (device); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3751,6 +3748,10 @@ static void register_types(void) qemu_chr_parse_serial);register_char_driver_qapi ("tty" ,CHARDEV_BACKEND_KIND_SERIAL , qemu_chr_parse_serial); +register_char_driver_qapi ("parallel" ,CHARDEV_BACKEND_KIND_PARALLEL , + qemu_chr_parse_parallel); +register_char_driver_qapi ("parport" ,CHARDEV_BACKEND_KIND_PARALLEL , + qemu_chr_parse_parallel);#ifdef _WIN32register_char_driver ("pipe" , qemu_chr_open_win_pipe);register_char_driver ("console" , qemu_chr_open_win_con);
@@ -3760,10 +3761,6 @@ static void register_types(void)#ifdef HAVE_CHARDEV_TTY register_char_driver ("pty" , qemu_chr_open_pty);#endif -#ifdef HAVE_CHARDEV_PARPORT -register_char_driver ("parallel" , qemu_chr_open_pp); -register_char_driver ("parport" , qemu_chr_open_pp); -#endif }type_init (register_types);
Signature · 1 line
1.7.9.7
Hi,
Quoted 1 line
git://git.kraxel.org/qemuchardev.3
Pushed chardev.4 ...
Quoted 2 lines
chardev: add vc support to qapi
[fixup] vc
... with these two guys squashed.
sorry for the trouble,
Gerd
Quoted 5 lines · Gerd Hoffmann
Hi,
Quoted 1 line
git://git.kraxel.org/qemuchardev.3Pushed chardev.4 ...
Please send another pull request with a v2. Otherwise it confuses my scripts.
Regards,
Anthony Liguori
Quoted 9 lines
Quoted 3 lines
chardev: add vc support to qapi
[fixup] vc... with these two guys squashed.
sorry for the trouble,
Gerd
PATCH 10/19 chardev: switch pty init to qapi
In reply to Gerd HoffmannThis patch switches over the pty chardev initialization to the new qapi code path.
Bonus: Taking QemuOpts out of the loop allows some nice cleanups along the way.
--- qemu-char.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-)
qemu-char.c +10 -25
@@ -1133,13 +1133,13 @@ static void pty_chr_close(struct CharDriverState *chr)qemu_chr_be_event (chr,CHR_EVENT_CLOSED ); } -static CharDriverState *qemu_chr_open_pty (QemuOpts *opts) +static CharDriverState *qemu_chr_open_pty (const char *id, +ChardevReturn *ret) {CharDriverState *chr;PtyCharDriver *s;struct termios tty; -const char *label; -int master_fd, slave_fd, len; +int master_fd, slave_fd;#if defined(__OpenBSD__) || defined(__DragonFly__)char pty_name[PATH_MAX ];#define q_ptsname (x) pty_name
@@ -1160,17 +1160,12 @@ static CharDriverState *qemu_chr_open_pty(QemuOpts *opts) chr =g_malloc0 (sizeof (CharDriverState)); - len =strlen (q_ptsname (master_fd)) +5 ; - chr->filename =g_malloc (len); -snprintf (chr->filename, len,"pty:%s" ,q_ptsname (master_fd)); -qemu_opt_set (opts,"path" ,q_ptsname (master_fd)); + chr->filename =g_strdup_printf ("pty:%s" ,q_ptsname (master_fd)); + ret->pty =g_strdup (q_ptsname (master_fd)); + ret->has_pty = true; - label =qemu_opts_id (opts); -fprintf (stderr,"char device redirected to %s%s%s%s\n" , -q_ptsname (master_fd), - label ?" (label " :"" , - label ? label :"" , - label ?")" :"" ); +fprintf (stderr,"char device redirected to %s (label %s)\n" , +q_ptsname (master_fd), id); s =g_malloc0 (sizeof (PtyCharDriver)); chr->opaque = s;
@@ -3663,16 +3658,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,break ;#ifdef HAVE_CHARDEV_TTY case CHARDEV_BACKEND_KIND_PTY : - { -/* qemu_chr_open_pty sets "path" in opts */ -QemuOpts *opts; - opts =qemu_opts_create_nofail (qemu_find_opts ("chardev" )); - chr =qemu_chr_open_pty (opts); - ret->pty =g_strdup (qemu_opt_get (opts,"path" )); - ret->has_pty = true; -qemu_opts_del (opts); + chr =qemu_chr_open_pty (id, ret);break ; - }#endif case CHARDEV_BACKEND_KIND_NULL : chr =qemu_chr_open_null ();
@@ -3752,15 +3739,13 @@ static void register_types(void) qemu_chr_parse_parallel);register_char_driver_qapi ("parport" ,CHARDEV_BACKEND_KIND_PARALLEL , qemu_chr_parse_parallel); +register_char_driver_qapi ("pty" ,CHARDEV_BACKEND_KIND_PTY ,NULL );#ifdef _WIN32register_char_driver ("pipe" , qemu_chr_open_win_pipe);register_char_driver ("console" , qemu_chr_open_win_con);#else register_char_driver ("pipe" , qemu_chr_open_pipe);#endif -#ifdef HAVE_CHARDEV_TTY -register_char_driver ("pty" , qemu_chr_open_pty); -#endif }type_init (register_types);
Signature · 1 line
1.7.9.7
PATCH 11/19 chardev: add console support to qapi
In reply to Gerd HoffmannThis patch adds 'console' support to qapi and also switches over the console chardev initialization to the new qapi code path.
--- qapi-schema.json | 3 ++- qemu-char.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
qapi-schema.json +2 -1
@@ -3226,7 +3226,8 @@ 'mux' : 'ChardevMux', 'msmouse': 'ChardevDummy', 'braille': 'ChardevDummy', - 'stdio' : 'ChardevStdio' } } + 'stdio' : 'ChardevStdio', + 'console': 'ChardevDummy' } } ## # @ChardevReturn:
qemu-char.c +7 -2
@@ -1928,7 +1928,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)return chr; } -static CharDriverState *qemu_chr_open_win_con (QemuOpts *opts) +static CharDriverState *qemu_chr_open_win_con (void ) {return qemu_chr_open_win_file (GetStdHandle (STD_OUTPUT_HANDLE )); }
@@ -3684,6 +3684,11 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,case CHARDEV_BACKEND_KIND_STDIO : chr =qemu_chr_open_stdio (backend->stdio);break ; +#ifdef _WIN32 +case CHARDEV_BACKEND_KIND_CONSOLE : + chr =qemu_chr_open_win_con (); +break ; +#endif default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
@@ -3740,9 +3745,9 @@ static void register_types(void)register_char_driver_qapi ("parport" ,CHARDEV_BACKEND_KIND_PARALLEL , qemu_chr_parse_parallel);register_char_driver_qapi ("pty" ,CHARDEV_BACKEND_KIND_PTY ,NULL ); +register_char_driver_qapi ("console" ,CHARDEV_BACKEND_KIND_CONSOLE ,NULL );#ifdef _WIN32register_char_driver ("pipe" , qemu_chr_open_win_pipe); -register_char_driver ("console" , qemu_chr_open_win_con);#else register_char_driver ("pipe" , qemu_chr_open_pipe);#endif
Signature · 1 line
1.7.9.7
PATCH 12/19 chardev: add pipe support to qapi
In reply to Gerd HoffmannThis patch adds 'pipe' support to qapi and also switches over the pipe chardev initialization to the new qapi code path.
--- qapi-schema.json | 3 ++- qemu-char.c | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-)
qapi-schema.json +2 -1
@@ -3153,7 +3153,7 @@ ## # @ChardevHostdev: # -# Configuration info for device chardevs. +# Configuration info for device and pipe chardevs. # # @device: The name of the special file for the device, # i.e. /dev/ttyS0 on Unix or COM1: on Windows
@@ -3220,6 +3220,7 @@ { 'union': 'ChardevBackend', 'data': { 'file' : 'ChardevFile', 'serial' : 'ChardevHostdev', 'parallel': 'ChardevHostdev', + 'pipe' : 'ChardevHostdev', 'socket' : 'ChardevSocket', 'pty' : 'ChardevDummy', 'null' : 'ChardevDummy',
qemu-char.c +22 -9
@@ -817,11 +817,11 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out)return chr; } -static CharDriverState *qemu_chr_open_pipe (QemuOpts *opts) +static CharDriverState *qemu_chr_open_pipe (ChardevHostdev *opts) {int fd_in, fd_out;char filename_in[256 ], filename_out[256 ]; -const char *filename =qemu_opt_get (opts,"path" ); +const char *filename = opts->device;if (filename ==NULL ) {fprintf (stderr,"chardev: pipe: no filename given\n" );
@@ -1893,9 +1893,9 @@ static int win_chr_pipe_init(CharDriverState *chr, const char *filename) } -static CharDriverState *qemu_chr_open_win_pipe (QemuOpts *opts) +static CharDriverState *qemu_chr_open_pipe (ChardevHostdev *opts) { -const char *filename =qemu_opt_get (opts,"path" ); +const char *filename = opts->device;CharDriverState *chr;WinCharState *s;
@@ -3164,6 +3164,19 @@ static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backend, backend->parallel->device =g_strdup (device); } +static void qemu_chr_parse_pipe (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ +const char *device =qemu_opt_get (opts,"path" ); + +if (device ==NULL ) { +error_setg (errp,"chardev: pipe: no device path given" ); +return ; + } + backend->pipe =g_new0 (ChardevHostdev,1 ); + backend->pipe->device =g_strdup (device); +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3653,6 +3666,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,case CHARDEV_BACKEND_KIND_PARALLEL : chr =qmp_chardev_open_parallel (backend->parallel, errp);break ; +case CHARDEV_BACKEND_KIND_PIPE : + chr =qemu_chr_open_pipe (backend->pipe); +break ;case CHARDEV_BACKEND_KIND_SOCKET : chr =qmp_chardev_open_socket (backend->socket, errp);break ;
@@ -3746,11 +3762,8 @@ static void register_types(void) qemu_chr_parse_parallel);register_char_driver_qapi ("pty" ,CHARDEV_BACKEND_KIND_PTY ,NULL );register_char_driver_qapi ("console" ,CHARDEV_BACKEND_KIND_CONSOLE ,NULL ); -#ifdef _WIN32 -register_char_driver ("pipe" , qemu_chr_open_win_pipe); -#else -register_char_driver ("pipe" , qemu_chr_open_pipe); -#endif +register_char_driver_qapi ("pipe" ,CHARDEV_BACKEND_KIND_PIPE , + qemu_chr_parse_pipe); }type_init (register_types);
Signature · 1 line
1.7.9.7
PATCH 13/19 chardev: add spice support to qapi
In reply to Gerd HoffmannThis patch adds 'spicevmc' and 'spiceport' support to qapi and also switches over the spice chardev initialization to the new qapi code path.
--- include/ui/qemu-spice.h | 7 ++++-- qapi-schema.json | 26 +++++++++++++++++++- qemu-char.c | 8 ++++++ spice-qemu-char.c | 62 +++++++++++++++++++++++++++++++---------------- 4 files changed, 79 insertions(+), 24 deletions(-)
include/ui/qemu-spice.h +5 -2
@@ -44,10 +44,13 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,void do_info_spice_print (Monitor *mon,const QObject *data);void do_info_spice (Monitor *mon,QObject **ret_data); -CharDriverState *qemu_chr_open_spice (QemuOpts *opts); +CharDriverState *qemu_chr_open_spice_vmc (const char *type);#if SPICE_SERVER_VERSION >=0x000c02 -CharDriverState *qemu_chr_open_spice_port (QemuOpts *opts); +CharDriverState *qemu_chr_open_spice_port (const char *name);void qemu_spice_register_ports (void ); +#else +static inline CharDriverState *qemu_chr_open_spice_port (const char *name) +{return NULL ; }#endif #else /* CONFIG_SPICE */
qapi-schema.json +25 -1
@@ -3209,6 +3209,28 @@ { 'type': 'ChardevStdio', 'data': { '*signal' : 'bool' } } ## +# @ChardevSpiceChannel: +# +# Configuration info for spice vm channel chardevs. +# +# @type: kind of channel (for example vdagent). +# +# Since: 1.5 +## +{ 'type': 'ChardevSpiceChannel', 'data': { 'type' : 'str' } } + +## +# @ChardevSpicePort: +# +# Configuration info for spice port chardevs. +# +# @fqdn: name of the channel (see docs/spice-port-fqdn.txt) +# +# Since: 1.5 +## +{ 'type': 'ChardevSpicePort', 'data': { 'fqdn' : 'str' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend.
@@ -3228,7 +3250,9 @@ 'msmouse': 'ChardevDummy', 'braille': 'ChardevDummy', 'stdio' : 'ChardevStdio', - 'console': 'ChardevDummy' } } + 'console': 'ChardevDummy', + 'spicevmc' : 'ChardevSpiceChannel', + 'spiceport' : 'ChardevSpicePort' } } ## # @ChardevReturn:
qemu-char.c +8 -0
@@ -3705,6 +3705,14 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr =qemu_chr_open_win_con ();break ;#endif +#ifdef CONFIG_SPICE +case CHARDEV_BACKEND_KIND_SPICEVMC : + chr =qemu_chr_open_spice_vmc (backend->spicevmc->type); +break ; +case CHARDEV_BACKEND_KIND_SPICEPORT : + chr =qemu_chr_open_spice_port (backend->spiceport->fqdn); +break ; +#endif default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
spice-qemu-char.c +41 -21
122 lines not on this page · raw message
Signature · 1 line
1.7.9.7
PATCH 14/19 chardev: add vc support to qapi
In reply to Gerd HoffmannThis patch adds 'vc' support to qapi and also switches over the vc chardev initialization to the new qapi code path.
--- include/ui/console.h | 4 ++-- qapi-schema.json | 20 ++++++++++++++++- ui/console.c | 61 ++++++++++++++++++++++++++++++++++++++++---------- ui/gtk.c | 2 +- 4 files changed, 71 insertions(+), 16 deletions(-)
include/ui/console.h +2 -2
@@ -450,9 +450,9 @@ void qemu_console_resize(DisplayState *ds, int width, int height);void qemu_console_copy (DisplayState *ds,int src_x,int src_y,int dst_x,int dst_y,int w,int h); -typedef CharDriverState *(VcHandler )(QemuOpts *); +typedef CharDriverState *(VcHandler )(ChardevVC *vc); -CharDriverState *vc_init (QemuOpts *opts); +CharDriverState *vc_init (ChardevVC *vc);void register_vc_handler (VcHandler *handler);/* sdl.c */
qapi-schema.json +19 -1
@@ -3231,6 +3231,23 @@ { 'type': 'ChardevSpicePort', 'data': { 'fqdn' : 'str' } } ## +# @ChardevVC: +# +# Configuration info for virtual console chardevs. +# +# @width: console width, in pixels +# @height: console height, in pixels +# @cols: console width, in chars +# @rows: console height, in chars +# +# Since: 1.5 +## +{ 'type': 'ChardevVC', 'data': { '*width' : 'int', + '*height' : 'int', + '*cols' : 'int', + '*rows' : 'int' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend.
@@ -3252,7 +3269,8 @@ 'stdio' : 'ChardevStdio', 'console': 'ChardevDummy', 'spicevmc' : 'ChardevSpiceChannel', - 'spiceport' : 'ChardevSpicePort' } } + 'spiceport' : 'ChardevSpicePort', + 'vc' : 'ChardevVC' } } ## # @ChardevReturn:
ui/console.c +49 -12
89 lines not on this page · raw message
ui/gtk.c +1 -1
@@ -991,7 +991,7 @@ static int gd_vc_chr_write(CharDriverState *chr, const uint8_t *buf, int len)static int nb_vcs;static CharDriverState *vcs[MAX_VCS ]; -static CharDriverState *gd_vc_handler (QemuOpts *opts) +static CharDriverState *gd_vc_handler (ChardevVC *unused) {CharDriverState *chr;
Signature · 1 line
1.7.9.7
PATCH 15/19 vc
In reply to Gerd Hoffmann--- qemu-char.c | 3 +++ 1 file changed, 3 insertions(+)
qemu-char.c +3 -0
@@ -3713,6 +3713,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr =qemu_chr_open_spice_port (backend->spiceport->fqdn);break ;#endif +case CHARDEV_BACKEND_KIND_VC : + chr =vc_init (backend->vc); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
Signature · 1 line
1.7.9.7
Re: [Qemu-devel] [PATCH 15/19] [fixup] vc
Quoted 4 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- qemu-char.c | 3 +++ 1 file changed, 3 insertions(+)
Did something go wrong in your rebase? The subject line suggest you intended to squash this to another patch.
Quoted 16 lines
qemu-char.c +3
-0@@ -3713,6 +3713,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr =qemu_chr_open_spice_port (backend->spiceport->fqdn);break ;#endif +case CHARDEV_BACKEND_KIND_VC : + chr =vc_init (backend->vc); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH 15/19] [fixup] vc
Quoted 6 lines · Eric Blake
Quoted 2 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]> --- qemu-char.c| 3 +++ 1 file changed, 3 insertions(+)
Did something go wrong in your rebase? The subject line suggest you intended to squash this to another patch.
Yes, into #14 (see my cover letter reply).
cheers,
Gerd
PATCH 16/19 chardev: add memory (ringbuf) support to qapi
In reply to Gerd HoffmannThis patch adds 'memory' support to qapi and also switches over the memory chardev initialization to the new qapi code path.
--- qapi-schema.json | 14 +++++++++++++- qemu-char.c | 30 +++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 8 deletions(-)
qapi-schema.json +13 -1
@@ -3248,6 +3248,17 @@ '*rows' : 'int' } } ## +# @ChardevRingbuf: +# +# Configuration info for memory chardevs +# +# @size: #optional Ringbuffer size, must be power of two, default is 65536 +# +# Since: 1.5 +## +{ 'type': 'ChardevRingbuf', 'data': { '*size' : 'int' } } + +## # @ChardevBackend: # # Configuration info for the new chardev backend.
@@ -3270,7 +3281,8 @@ 'console': 'ChardevDummy', 'spicevmc' : 'ChardevSpiceChannel', 'spiceport' : 'ChardevSpicePort', - 'vc' : 'ChardevVC' } } + 'vc' : 'ChardevVC', + 'memory' : 'ChardevRingbuf' } } ## # @ChardevReturn:
qemu-char.c +23 -7
@@ -2860,7 +2860,8 @@ static void ringbuf_chr_close(struct CharDriverState *chr) chr->opaque =NULL ; } -static CharDriverState *qemu_chr_open_ringbuf (QemuOpts *opts) +static CharDriverState *qemu_chr_open_ringbuf (ChardevRingbuf *opts, +Error **errp) {CharDriverState *chr;RingBufCharDriver *d;
@@ -2868,14 +2869,11 @@ static CharDriverState *qemu_chr_open_ringbuf(QemuOpts *opts) chr =g_malloc0 (sizeof (CharDriverState)); d =g_malloc (sizeof (*d)); - d->size =qemu_opt_get_size (opts,"size" ,0 ); -if (d->size ==0 ) { - d->size =65536 ; - } + d->size = opts->has_size ? opts->size :65536 ;/* The size must be power of 2 */ if (d->size & (d->size -1 )) { -error_report ("size of ringbuf device must be power of two" ); +error_setg (errp,"size of ringbuf chardev must be power of two" ); goto fail; }
@@ -3177,6 +3175,20 @@ static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend, backend->pipe->device =g_strdup (device); } +static void qemu_chr_parse_ringbuf (QemuOpts *opts,ChardevBackend *backend, +Error **errp) +{ +int val; + + backend->memory =g_new0 (ChardevRingbuf,1 ); + + val =qemu_opt_get_number (opts,"size" ,0 ); +if (val !=0 ) { + backend->memory->has_size = true; + backend->memory->size = val; + } +} + typedef struct CharDriver { const char *name; /* old, pre qapi */
@@ -3716,6 +3728,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,case CHARDEV_BACKEND_KIND_VC : chr =vc_init (backend->vc);break ; +case CHARDEV_BACKEND_KIND_MEMORY : + chr =qemu_chr_open_ringbuf (backend->memory, errp); +break ;default :error_setg (errp,"unknown chardev backend (%d)" , backend->kind);break ;
@@ -3758,7 +3773,8 @@ static void register_types(void)register_char_driver_qapi ("null" ,CHARDEV_BACKEND_KIND_NULL ,NULL );register_char_driver ("socket" , qemu_chr_open_socket);register_char_driver ("udp" , qemu_chr_open_udp); -register_char_driver ("memory" , qemu_chr_open_ringbuf); +register_char_driver_qapi ("memory" ,CHARDEV_BACKEND_KIND_MEMORY , + qemu_chr_parse_ringbuf);register_char_driver_qapi ("file" ,CHARDEV_BACKEND_KIND_FILE , qemu_chr_parse_file_out); register_char_driver_qapi("stdio", CHARDEV_BACKEND_KIND_STDIO,
Signature · 1 line
1.7.9.7
PATCH 17/19 chardev: add udp support to qapi
In reply to Gerd HoffmannThis patch adds 'udp' support to qapi.
--- include/qemu/sockets.h | 1 + qapi-schema.json | 16 +++++++++++++++- qemu-char.c | 44 ++++++++++++++++++++++++++------------------ util/qemu-sockets.c | 25 +++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 19 deletions(-)
include/qemu/sockets.h +1 -0
@@ -70,6 +70,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);
qapi-schema.json +15 -1
@@ -3166,7 +3166,7 @@ ## # @ChardevSocket: # -# Configuration info for socket chardevs. +# Configuration info for (stream) socket chardevs. # # @addr: socket address to listen on (server=true) # or connect to (server=false)
@@ -3185,6 +3185,19 @@ '*telnet' : 'bool' } } ## +# @ChardevDgram: +# +# Configuration info for datagram socket chardevs. +# +# @remote: remote address +# @local: #optional local address +# +# Since: 1.5 +## +{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress', + '*local' : 'SocketAddress' } } + +## # @ChardevMux: # # Configuration info for mux chardevs.
@@ -3272,6 +3285,7 @@ 'parallel': 'ChardevHostdev', 'pipe' : 'ChardevHostdev', 'socket' : 'ChardevSocket', + 'dgram' : 'ChardevDgram', 'pty' : 'ChardevDummy', 'null' : 'ChardevDummy', 'mux' : 'ChardevMux',
qemu-char.c +26 -18
77 lines not on this page · raw message
util/qemu-sockets.c +25 -0
@@ -949,6 +949,31 @@ int socket_listen(SocketAddress *addr, Error **errp)return fd; } +int socket_dgram (SocketAddress *remote,SocketAddress *local,Error **errp) +{ +QemuOpts *opts; +int fd; + + opts =qemu_opts_create_nofail (&dummy_opts); +switch (remote->kind) { +case SOCKET_ADDRESS_KIND_INET : +qemu_opt_set (opts,"host" , remote->inet->host); +qemu_opt_set (opts,"port" , remote->inet->port); +if (local) { +qemu_opt_set (opts,"localaddr" , local->inet->host); +qemu_opt_set (opts,"localport" , local->inet->port); + } + fd =inet_dgram_opts (opts, errp); +break ; + +default : +error_setg (errp,"socket type unsupported for datagram" ); +return -1 ; + } +qemu_opts_del (opts); +return fd; +} +#ifdef _WIN32static void socket_cleanup (void ) {
Signature · 1 line
1.7.9.7
PATCH 18/19 Revert "hmp: Disable chardev-add and chardev-remove"
In reply to Gerd HoffmannThis reverts commit 8a14952c9d2f5fa2b3caa6dc286b62ed5d26bca7.
--- hmp-commands.hx | 63 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 32 deletions(-)
hmp-commands.hx +31 -32
@@ -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",
Signature · 1 line
1.7.9.7
PATCH 19/19 qemu-char.c: fix waiting for telnet connection message
In reply to Gerd HoffmannFrom: Igor Mitsyanko <[email protected]>
Current colon position in "waiting for telnet connection" message template produces messages like:
QEMU waiting for connection on: telnet::127.0.0.16666,server
After moving a colon to the right, we will get a correct messages like:
QEMU waiting for connection on: telnet:127.0.0.1:6666,server
--- qemu-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-char.c +1 -1
@@ -2632,7 +2632,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay, s->do_nodelay = do_nodelay;getnameinfo ((struct sockaddr *) &ss, ss_len, host,sizeof (host), serv,sizeof (serv),NI_NUMERICHOST |NI_NUMERICSERV ); -snprintf (chr->filename,256 ,"%s:%s:%s%s%s%s" , +snprintf (chr->filename,256 ,"%s:%s%s%s:%s%s" , is_telnet ?"telnet" :"tcp" , left, host, right, serv, is_listen ?",server" :"" );
Signature · 1 line
1.7.9.7