mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chardev: finalize 'reconnect' deprecation

Browse Source 
Change all related docs and tests to use the new 'reconnect-ms' option
instead of the now deprecated 'reconnect'.

Signed-off-by: Daniil Tatianin <d-tatianin@yandex-team.ru>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Daniil Tatianin 2024-10-25 10:35:25 +03:00 committed by Jason Wang
parent c40e962d83
commit 96e610b23d
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/COLO-FT.txt
View File

@ -193,8 +193,8 @@ any IP's here, except for the $primary_ip variable.
-device piix3-usb-uhci -device usb-tablet -name secondary \ -device piix3-usb-uhci -device usb-tablet -name secondary \
-netdev tap,id=hn0,vhost=off,helper=/usr/lib/qemu/qemu-bridge-helper \ -netdev tap,id=hn0,vhost=off,helper=/usr/lib/qemu/qemu-bridge-helper \
-device rtl8139,id=e0,netdev=hn0 \ -device rtl8139,id=e0,netdev=hn0 \
-chardev socket,id=red0,host=$primary_ip,port=9003,reconnect=1 \ -chardev socket,id=red0,host=$primary_ip,port=9003,reconnect-ms=1000 \
-chardev socket,id=red1,host=$primary_ip,port=9004,reconnect=1 \ -chardev socket,id=red1,host=$primary_ip,port=9004,reconnect-ms=1000 \
-object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0 \ -object filter-redirector,id=f1,netdev=hn0,queue=tx,indev=red0 \
-object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1 \ -object filter-redirector,id=f2,netdev=hn0,queue=rx,outdev=red1 \
-object filter-rewriter,id=rew0,netdev=hn0,queue=all \ -object filter-rewriter,id=rew0,netdev=hn0,queue=all \

2
docs/system/ppc/powernv.rst
View File

@ -181,7 +181,7 @@ connected to a remote QEMU machine acting as BMC, using these options
.. code-block:: bash .. code-block:: bash
-chardev socket,id=ipmi0,host=localhost,port=9002,reconnect=10 \ -chardev socket,id=ipmi0,host=localhost,port=9002,reconnect-ms=10000 \
-device ipmi-bmc-extern,id=bmc0,chardev=ipmi0 \ -device ipmi-bmc-extern,id=bmc0,chardev=ipmi0 \
-device isa-ipmi-bt,bmc=bmc0,irq=10 \ -device isa-ipmi-bt,bmc=bmc0,irq=10 \
-nodefaults -nodefaults

22
qemu-options.hx
View File

@ -1102,7 +1102,7 @@ SRST
external entity that provides the IPMI services. external entity that provides the IPMI services.
A connection is made to an external BMC simulator. If you do this, A connection is made to an external BMC simulator. If you do this,
it is strongly recommended that you use the "reconnect=" chardev it is strongly recommended that you use the "reconnect-ms=" chardev
option to reconnect to the simulator if the connection is lost. Note option to reconnect to the simulator if the connection is lost. Note
that if this is not used carefully, it can be a security issue, as that if this is not used carefully, it can be a security issue, as
the interface has the ability to send resets, NMIs, and power off the interface has the ability to send resets, NMIs, and power off
@ -3318,8 +3318,8 @@ SRST
``ipv6=on|off`` ``ipv6=on|off``
whether to accept IPv6 addresses, default to try both IPv4 and IPv6 whether to accept IPv6 addresses, default to try both IPv4 and IPv6
``reconnect=seconds`` ``reconnect-ms=milliseconds``
for a client socket, if a socket is disconnected, then attempt a reconnect after the given number of seconds. for a client socket, if a socket is disconnected, then attempt a reconnect after the given number of milliseconds.
Setting this to zero disables this function. (default: 0) Setting this to zero disables this function. (default: 0)
Example (two guests connected using a TCP/IP socket): Example (two guests connected using a TCP/IP socket):
@ -3388,8 +3388,8 @@ SRST
``addr.str=file-descriptor`` ``addr.str=file-descriptor``
file descriptor number to use as a socket file descriptor number to use as a socket
``reconnect=seconds`` ``reconnect-ms=milliseconds``
for a client socket, if a socket is disconnected, then attempt a reconnect after the given number of seconds. for a client socket, if a socket is disconnected, then attempt a reconnect after the given number of milliseconds.
Setting this to zero disables this function. (default: 0) Setting this to zero disables this function. (default: 0)
``-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=inet,local.host=addr]`` ``-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=inet,local.host=addr]``
@ -3679,9 +3679,9 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
"-chardev help\n" "-chardev help\n"
"-chardev null,id=id[,mux=on|off][,logfile=PATH][,logappend=on|off]\n" "-chardev null,id=id[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
"-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off]\n" "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off]\n"
" [,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds][,mux=on|off]\n" " [,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect-ms=milliseconds][,mux=on|off]\n"
" [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n" " [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n"
"-chardev socket,id=id,path=path[,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds]\n" "-chardev socket,id=id,path=path[,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect-ms=milliseconds]\n"
" [,mux=on|off][,logfile=PATH][,logappend=on|off][,abstract=on|off][,tight=on|off] (unix)\n" " [,mux=on|off][,logfile=PATH][,logappend=on|off][,abstract=on|off][,tight=on|off] (unix)\n"
"-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr]\n" "-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr]\n"
" [,localport=localport][,ipv4=on|off][,ipv6=on|off][,mux=on|off]\n" " [,localport=localport][,ipv4=on|off][,ipv6=on|off][,mux=on|off]\n"
@ -3792,7 +3792,7 @@ The available backends are:
A void device. This device will not emit any data, and will drop any A void device. This device will not emit any data, and will drop any
data it receives. The null backend does not take any options. data it receives. The null backend does not take any options.
``-chardev socket,id=id[,TCP options or unix options][,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds][,tls-creds=id][,tls-authz=id]`` ``-chardev socket,id=id[,TCP options or unix options][,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect-ms=milliseconds][,tls-creds=id][,tls-authz=id]``
Create a two-way stream socket, which can be either a TCP or a unix Create a two-way stream socket, which can be either a TCP or a unix
socket. A unix socket will be created if ``path`` is specified. socket. A unix socket will be created if ``path`` is specified.
Behaviour is undefined if TCP options are specified for a unix Behaviour is undefined if TCP options are specified for a unix
@ -3809,9 +3809,9 @@ The available backends are:
``websocket=on|off`` specifies that the socket uses WebSocket protocol for ``websocket=on|off`` specifies that the socket uses WebSocket protocol for
communication. communication.
``reconnect`` sets the timeout for reconnecting on non-server ``reconnect-ms`` sets the timeout for reconnecting on non-server
sockets when the remote end goes away. qemu will delay this many sockets when the remote end goes away. qemu will delay this many
seconds and then attempt to reconnect. Zero disables reconnecting, milliseconds and then attempt to reconnect. Zero disables reconnecting,
and is the default. and is the default.
``tls-creds`` requests enablement of the TLS protocol for ``tls-creds`` requests enablement of the TLS protocol for
@ -4427,7 +4427,7 @@ SRST
The WebSocket protocol is used instead of raw tcp socket. The The WebSocket protocol is used instead of raw tcp socket. The
port acts as a WebSocket server. Client mode is not supported. port acts as a WebSocket server. Client mode is not supported.
``unix:path[,server=on|off][,wait=on|off][,reconnect=seconds]`` ``unix:path[,server=on|off][,wait=on|off][,reconnect-ms=milliseconds]``
A unix domain socket is used instead of a tcp socket. The option A unix domain socket is used instead of a tcp socket. The option
works the same as if you had specified ``-serial tcp`` except works the same as if you had specified ``-serial tcp`` except
the unix domain socket path is used for connections. the unix domain socket path is used for connections.

2
tests/qtest/ipmi-bt-test.c
View File

@ -411,7 +411,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
global_qtest = qtest_initf( global_qtest = qtest_initf(
" -chardev socket,id=ipmi0,host=127.0.0.1,port=%d,reconnect=10" " -chardev socket,id=ipmi0,host=127.0.0.1,port=%d,reconnect-ms=10000"
" -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0" " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
" -device isa-ipmi-bt,bmc=bmc0", emu_port); " -device isa-ipmi-bt,bmc=bmc0", emu_port);
qtest_irq_intercept_in(global_qtest, "ioapic"); qtest_irq_intercept_in(global_qtest, "ioapic");

2
tests/qtest/vhost-user-test.c
View File

@ -920,7 +920,7 @@ static void wait_for_rings_started(TestServer *s, size_t count)
static inline void test_server_connect(TestServer *server) static inline void test_server_connect(TestServer *server)
{ {
test_server_create_chr(server, ",reconnect=1"); test_server_create_chr(server, ",reconnect-ms=1000");
} }
static gboolean static gboolean

8
tests/unit/test-char.c
View File

@ -1545,18 +1545,18 @@ int main(int argc, char **argv)
static CharSocketClientTestConfig client2 ## name = \ static CharSocketClientTestConfig client2 ## name = \
{ addr, NULL, true, false, char_socket_event }; \ { addr, NULL, true, false, char_socket_event }; \
static CharSocketClientTestConfig client3 ## name = \ static CharSocketClientTestConfig client3 ## name = \
{ addr, ",reconnect=1", false, false, char_socket_event }; \ { addr, ",reconnect-ms=1000", false, false, char_socket_event }; \
static CharSocketClientTestConfig client4 ## name = \ static CharSocketClientTestConfig client4 ## name = \
{ addr, ",reconnect=1", true, false, char_socket_event }; \ { addr, ",reconnect-ms=1000", true, false, char_socket_event }; \
static CharSocketClientTestConfig client5 ## name = \ static CharSocketClientTestConfig client5 ## name = \
{ addr, NULL, false, true, char_socket_event }; \ { addr, NULL, false, true, char_socket_event }; \
static CharSocketClientTestConfig client6 ## name = \ static CharSocketClientTestConfig client6 ## name = \
{ addr, NULL, true, true, char_socket_event }; \ { addr, NULL, true, true, char_socket_event }; \
static CharSocketClientTestConfig client7 ## name = \ static CharSocketClientTestConfig client7 ## name = \
{ addr, ",reconnect=1", true, false, \ { addr, ",reconnect-ms=1000", true, false, \
char_socket_event_with_error }; \ char_socket_event_with_error }; \
static CharSocketClientTestConfig client8 ## name = \ static CharSocketClientTestConfig client8 ## name = \
{ addr, ",reconnect=1", false, false, char_socket_event }; \ { addr, ",reconnect-ms=1000", false, false, char_socket_event };\
g_test_add_data_func("/char/socket/client/mainloop/" # name, \ g_test_add_data_func("/char/socket/client/mainloop/" # name, \
&client1 ##name, char_socket_client_test); \ &client1 ##name, char_socket_client_test); \
g_test_add_data_func("/char/socket/client/wait-conn/" # name, \ g_test_add_data_func("/char/socket/client/wait-conn/" # name, \