qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	qemu-block@nongnu.org (open list:Network Block Dev...)
Subject: [PULL 03/13] nbd: drop unused nbd_start_negotiate() aio_context argument
Date: Thu,  7 Sep 2023 20:35:39 -0500	[thread overview]
Message-ID: <20230908013535.990731-18-eblake@redhat.com> (raw)
In-Reply-To: <20230908013535.990731-15-eblake@redhat.com>

From: Stefan Hajnoczi <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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230830224802.493686-3-stefanha@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 nbd/client.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/nbd/client.c b/nbd/client.c
index 16ec10c8a91..bd7e2001366 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



  parent reply	other threads:[~2023-09-08  1:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-08  1:35 [PULL 00/13] NBD patches through 2023-09-07 Eric Blake
2023-09-08  1:35 ` [PULL 01/13] qemu-iotests/197: use more generic commands for formats other than qcow2 Eric Blake
2023-09-08  1:35 ` [PULL 02/13] nbd: drop unused nbd_receive_negotiate() aio_context argument Eric Blake
2023-09-08  1:35 ` Eric Blake [this message]
2023-09-08  1:35 ` [PULL 04/13] io: check there are no qio_channel_yield() coroutines during ->finalize() Eric Blake
2023-09-08  1:35 ` [PULL 05/13] io: follow coroutine AioContext in qio_channel_yield() Eric Blake
2023-09-08  1:35 ` [PULL 06/13] util/iov: Avoid dynamic stack allocation Eric Blake
2023-09-08  1:35 ` [PULL 07/13] qemu-nbd: improve error message for dup2 error Eric Blake
2023-09-08  1:35 ` [PULL 08/13] qemu-nbd: define struct NbdClientOpts when HAVE_NBD_DEVICE is not defined Eric Blake
2023-09-08  1:35 ` [PULL 09/13] qemu-nbd: move srcpath into struct NbdClientOpts Eric Blake
2023-09-08  1:35 ` [PULL 10/13] qemu-nbd: put saddr into " Eric Blake
2023-09-08  1:35 ` [PULL 11/13] qemu-nbd: invent nbd_client_release_pipe() helper Eric Blake
2023-09-08  1:35 ` [PULL 12/13] qemu-nbd: Restore "qemu-nbd -v --fork" output Eric Blake
2023-09-08 11:03   ` Stefan Hajnoczi
2023-09-08 11:24     ` Denis V. Lunev
2023-09-08 11:42       ` Denis V. Lunev
2023-09-08 12:09         ` Eric Blake
2023-09-08  1:35 ` [PULL 13/13] qemu-nbd: document -v behavior in respect to --fork in man 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=20230908013535.990731-18-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=farosas@suse.de \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@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).