diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-02-12 08:48:44 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-02-12 08:48:44 -0500 |
| commit | d384903bb4b7def3f7f0d03e4707ca53f7584f1e (patch) | |
| tree | 860ea09a756f5157747cf9d98aae467cc119c19c /include | |
| parent | afbcca0ea41f109c2a5eae308d636dfcf98eb82b (diff) | |
| parent | ff12e6a5ff904e68e222b0ba567938943e0f4b68 (diff) | |
| download | focaccia-qemu-d384903bb4b7def3f7f0d03e4707ca53f7584f1e.tar.gz focaccia-qemu-d384903bb4b7def3f7f0d03e4707ca53f7584f1e.zip | |
Merge tag 'pull-nbd-2025-02-11' of https://repo.or.cz/qemu/ericb into staging
NBD patches for 2025-02-11 - Add --handshake-limit option to qemu-nbd # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmersd8ACgkQp6FrSiUn # Q2pDUAf/c7inV7W+9vQv15lZoadIJkXAhqu+j1YuITC52gMgmU1QcwXMXRPEak4V # qEIodiInzOtktMRXr6tbMroQgqo9eNd+VivxVa+J5LBILuZwdpZnLxsVNjblhbfI # R3swWs2qluh9/1czntRu0J+YVOj3YZnF86Z5+iwEdLQ+i15dtjXDirBRvGCd6miV # HLiEXwHdyPYb4g50a5oZCf3HhqPOgXOd+NWr4ifGut3bDulQk+FMDeBwV6/fmRPw # g7dFPHMrAEYMw8tScYTMCoZGSZl0lg1JNuSh/WwgXx7BgXtDDxyP4HaAXlIyOHIA # FbPU6aNrGZ9EDN4NA688IwUDh+lkmQ== # =WyjJ # -----END PGP SIGNATURE----- # gpg: Signature made Tue 11 Feb 2025 15:23:59 EST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * tag 'pull-nbd-2025-02-11' of https://repo.or.cz/qemu/ericb: nbd/server: Allow users to adjust handshake limit in QMP qemu-nbd: Allow users to adjust handshake limit Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/nbd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/block/nbd.h b/include/block/nbd.h index d4f8b21aec..92987c76fd 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -428,9 +428,9 @@ void nbd_client_put(NBDClient *client); void nbd_server_is_qemu_nbd(int max_connections); bool nbd_server_is_running(void); int nbd_server_max_connections(void); -void nbd_server_start(SocketAddress *addr, const char *tls_creds, - const char *tls_authz, uint32_t max_connections, - Error **errp); +void nbd_server_start(SocketAddress *addr, uint32_t handshake_max_secs, + const char *tls_creds, const char *tls_authz, + uint32_t max_connections, Error **errp); void nbd_server_start_options(NbdServerOptions *arg, Error **errp); /* nbd_read |