From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Leonardo Bras" <leobras@redhat.com>,
eblake@redhat.com, "Daniel P. Berrangé" <berrange@redhat.com>,
farosas@suse.de, kwolf@redhat.com, "Peter Xu" <peterx@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Juan Quintela" <quintela@redhat.com>,
qemu-block@nongnu.org, "Coiby Xu" <Coiby.Xu@gmail.com>,
"Fam Zheng" <fam@euphon.net>, "Hanna Reitz" <hreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [PATCH v2 2/4] nbd: drop unused nbd_start_negotiate() aio_context argument
Date: Tue, 29 Aug 2023 12:06:20 -0400 [thread overview]
Message-ID: <20230829160623.277411-3-stefanha@redhat.com> (raw)
In-Reply-To: <20230829160623.277411-1-stefanha@redhat.com>
aio_context is always NULL, so drop it.
Suggested-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
nbd/client.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index 16ec10c8a9..bd7e200136 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -877,8 +877,7 @@ static int nbd_list_meta_contexts(QIOChannel *ioc,
* Returns: negative errno: failure talking to server
* non-negative: enum NBDMode describing server abilities
*/
-static int nbd_start_negotiate(AioContext *aio_context, QIOChannel *ioc,
- QCryptoTLSCreds *tlscreds,
+static int nbd_start_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,
const char *hostname, QIOChannel **outioc,
bool structured_reply, bool *zeroes,
Error **errp)
@@ -946,10 +945,6 @@ static int nbd_start_negotiate(AioContext *aio_context, QIOChannel *ioc,
return -EINVAL;
}
ioc = *outioc;
- if (aio_context) {
- qio_channel_set_blocking(ioc, false, NULL);
- qio_channel_attach_aio_context(ioc, aio_context);
- }
} else {
error_setg(errp, "Server does not support STARTTLS");
return -EINVAL;
@@ -1026,7 +1021,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,
assert(info->name && strlen(info->name) <= NBD_MAX_STRING_SIZE);
trace_nbd_receive_negotiate_name(info->name);
- result = nbd_start_negotiate(NULL, ioc, tlscreds, hostname, outioc,
+ result = nbd_start_negotiate(ioc, tlscreds, hostname, outioc,
info->structured_reply, &zeroes, errp);
if (result < 0) {
return result;
@@ -1149,7 +1144,7 @@ int nbd_receive_export_list(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,
QIOChannel *sioc = NULL;
*info = NULL;
- result = nbd_start_negotiate(NULL, ioc, tlscreds, hostname, &sioc, true,
+ result = nbd_start_negotiate(ioc, tlscreds, hostname, &sioc, true,
NULL, errp);
if (tlscreds && sioc) {
ioc = sioc;
--
2.41.0
next prev parent reply other threads:[~2023-08-29 16:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 16:06 [PATCH v2 0/4] io: follow coroutine AioContext in qio_channel_yield() Stefan Hajnoczi
2023-08-29 16:06 ` [PATCH v2 1/4] nbd: drop unused nbd_receive_negotiate() aio_context argument Stefan Hajnoczi
2023-08-29 18:30 ` Eric Blake
2023-08-30 9:40 ` Philippe Mathieu-Daudé
2023-08-29 16:06 ` Stefan Hajnoczi [this message]
2023-08-29 18:32 ` [PATCH v2 2/4] nbd: drop unused nbd_start_negotiate() " Eric Blake
2023-08-30 9:40 ` Philippe Mathieu-Daudé
2023-08-29 16:06 ` [PATCH v2 3/4] io: check there are no qio_channel_yield() coroutines during ->finalize() Stefan Hajnoczi
2023-08-29 16:06 ` [PATCH v2 4/4] io: follow coroutine AioContext in qio_channel_yield() Stefan Hajnoczi
2023-08-29 19:32 ` Eric Blake
2023-08-29 20:29 ` Stefan Hajnoczi
2023-08-30 7:54 ` Daniel P. Berrangé
2023-08-31 13:30 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829160623.277411-3-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=vsementsov@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).