aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2023-04-04 17:01:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2023-04-04 17:01:46 +0100
commit992473749f7cf127e71bb8263c02577cca303055 (patch)
tree265623cfdfb2327fa7b1f71e082a4ea87cd5c464
parent4584e76c9ae0c03a562d4c9726fe7811ea3628c8 (diff)
parentf1426881a827a6d3f31b65616c4a8db1e9e7c45e (diff)
downloadqemu-992473749f7cf127e71bb8263c02577cca303055.zip
qemu-992473749f7cf127e71bb8263c02577cca303055.tar.gz
qemu-992473749f7cf127e71bb8263c02577cca303055.tar.bz2
Merge tag 'pull-nbd-2023-04-04' of https://repo.or.cz/qemu/ericb into staging
nbd patches for 2023-04-04 - Eric Blake: use TCP_NODELAY in nbd server, as followup to corking # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmQsIuAACgkQp6FrSiUn # Q2o/Vwf/UMxOlxHEEQsS5lkG6qbkL47GUxfxsXfd0yvU+ihFALrKEZrOlzYDZWKj # hww8Uqlh9lCjnTO8ekYl2eetNmDwMsV6mcCaiJ0aYZNAI87l4ekFy0Jfx58D36vv # j9HSELr09KjodoCISLDAwJCgs/GyQKmO+FzqvovbJH8nU0h24VEYgI6b5PHmII8U # LN0cm9xLO46KCTlWz7Y4Rt047rFVkh++n7l/nNjviJGm63BO2H9BCd3heea4uhdy # +7MR1Tb9VuMGe0PWews/SdZKwtCzClTCgmZw8MrrSs/39Qw2EZYXA9X64Qs97oKg # GbajABGVSrJSFkGTMhIFK9xgLZjaKQ== # =KZJ+ # -----END PGP SIGNATURE----- # gpg: Signature made Tue 04 Apr 2023 14:15:12 BST # 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-2023-04-04' of https://repo.or.cz/qemu/ericb: nbd/server: Request TCP_NODELAY Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--nbd/server.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/nbd/server.c b/nbd/server.c
index 848836d..3d8d0d8 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -2758,6 +2758,7 @@ void nbd_client_new(QIOChannelSocket *sioc,
}
client->tlsauthz = g_strdup(tlsauthz);
client->sioc = sioc;
+ qio_channel_set_delay(QIO_CHANNEL(sioc), false);
object_ref(OBJECT(client->sioc));
client->ioc = QIO_CHANNEL(sioc);
object_ref(OBJECT(client->ioc));