diff options
| author | Eric Blake <eblake@redhat.com> | 2023-08-29 12:58:29 -0500 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2023-09-22 17:20:41 -0500 |
| commit | 297365b40ff24c7e07d6f40ec8f9ac83229ace94 (patch) | |
| tree | d899b893663c89ea507361c762e7d1095c3762bb /nbd | |
| parent | ac132d0520c39f48a22e8666810792c5c9dd44b1 (diff) | |
nbd/client: Pass mode through to nbd_send_request
Once the 64-bit headers extension is enabled, the data layout we send
over the wire for a client request depends on the mode negotiated with
the server. Rather than adding a parameter to nbd_send_request, we
can add a member to struct NBDRequest, since it already does not
reflect on-wire format. Some callers initialize it directly; many
others rely on a common initialization point during
nbd_co_send_request(). At this point, there is no semantic change.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230829175826.377251-21-eblake@redhat.com>
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nbd/client.c b/nbd/client.c index 844be42181..345f1c0f2d 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -1218,7 +1218,7 @@ int nbd_receive_export_list(QIOChannel *ioc, QCryptoTLSCreds *tlscreds, /* Send NBD_CMD_DISC as a courtesy to the server, but ignore all * errors now that we have the information we wanted. */ if (nbd_drop(ioc, 124, NULL) == 0) { - NBDRequest request = { .type = NBD_CMD_DISC }; + NBDRequest request = { .type = NBD_CMD_DISC, .mode = result }; nbd_send_request(ioc, &request); } @@ -1348,6 +1348,7 @@ int nbd_send_request(QIOChannel *ioc, NBDRequest *request) { uint8_t buf[NBD_REQUEST_SIZE]; + assert(request->mode <= NBD_MODE_STRUCTURED); /* TODO handle extended */ trace_nbd_send_request(request->from, request->len, request->cookie, request->flags, request->type, nbd_cmd_lookup(request->type)); |