diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-06-04 05:23:20 -0500 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-06-04 05:23:20 -0500 |
| commit | 121e47c8bff8013bdce1ae2ae79bd2e16260c512 (patch) | |
| tree | 3319f45faf9dda7801a1be2046f6b8a17a067227 /io/channel-websock.c | |
| parent | d67a6e054b92e5e1cbb7b0bd5782a670cc7f0df7 (diff) | |
| parent | a73c99378022ebb785481e84cfe1e81097546268 (diff) | |
| download | focaccia-qemu-121e47c8bff8013bdce1ae2ae79bd2e16260c512.tar.gz focaccia-qemu-121e47c8bff8013bdce1ae2ae79bd2e16260c512.zip | |
Merge tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb into staging
NBD patches for 2024-05-30 - Fix AioContext assertion with NBD+TLS # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmZd0MYACgkQp6FrSiUn # Q2rrxwf8C+nhCy5d/d0DfBvDANEWB5zFGffC89t9P2ULJ6ehGlZuAyF8bCqnptPM # 76qhZfCz1XCUM0B+H+JXzcOsphTY5Y+hQ6Aq95VbuJgzq4CbAz4D30RNS0P5Q/ei # v1+goMTEegH1sSS6b0NueTj4chesMui3bJpiUnb3qPptZ+L0OWhIsk6Pe0N418UM # kmWC3kPWUPkmpxqXprcV/OunS6ipkfSVORfjxFNbFQcceuP45lt+f0YxhMHU8NIU # PwFiUaPPCy/mDFTHgqCmpqoivFroUyhQIFl5ucHmds2wTOTx9VpxunYNcrVCq6vY # UUfKc/p5lRArTqJXEth8cHlo1sFOEw== # =7ZGy # -----END PGP SIGNATURE----- # gpg: Signature made Mon 03 Jun 2024 09:18:46 AM CDT # 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] * tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb: iotests: test NBD+TLS+iothread qio: Inherit follow_coroutine_ctx across TLS Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'io/channel-websock.c')
| -rw-r--r-- | io/channel-websock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io/channel-websock.c b/io/channel-websock.c index a12acc27cf..de39f0d182 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -883,6 +883,7 @@ qio_channel_websock_new_server(QIOChannel *master) ioc = QIO_CHANNEL(wioc); wioc->master = master; + ioc->follow_coroutine_ctx = master->follow_coroutine_ctx; if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) { qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN); } |