mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-06 11:09:37 +00:00
nbd: drop unused nbd_receive_negotiate() aio_context argument
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-2-stefanha@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
b87151a848
commit
b84ca91ca2
|
@ -324,8 +324,7 @@ typedef struct NBDExportInfo {
|
||||||
char **contexts;
|
char **contexts;
|
||||||
} NBDExportInfo;
|
} NBDExportInfo;
|
||||||
|
|
||||||
int nbd_receive_negotiate(AioContext *aio_context, QIOChannel *ioc,
|
int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,
|
||||||
QCryptoTLSCreds *tlscreds,
|
|
||||||
const char *hostname, QIOChannel **outioc,
|
const char *hostname, QIOChannel **outioc,
|
||||||
NBDExportInfo *info, Error **errp);
|
NBDExportInfo *info, Error **errp);
|
||||||
void nbd_free_export_list(NBDExportInfo *info, int count);
|
void nbd_free_export_list(NBDExportInfo *info, int count);
|
||||||
|
|
|
@ -146,8 +146,7 @@ static int nbd_connect(QIOChannelSocket *sioc, SocketAddress *addr,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = nbd_receive_negotiate(NULL, QIO_CHANNEL(sioc), tlscreds,
|
ret = nbd_receive_negotiate(QIO_CHANNEL(sioc), tlscreds, tlshostname,
|
||||||
tlshostname,
|
|
||||||
outioc, info, errp);
|
outioc, info, errp);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1014,8 +1014,7 @@ static int nbd_negotiate_finish_oldstyle(QIOChannel *ioc, NBDExportInfo *info,
|
||||||
* Returns: negative errno: failure talking to server
|
* Returns: negative errno: failure talking to server
|
||||||
* 0: server is connected
|
* 0: server is connected
|
||||||
*/
|
*/
|
||||||
int nbd_receive_negotiate(AioContext *aio_context, QIOChannel *ioc,
|
int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds,
|
||||||
QCryptoTLSCreds *tlscreds,
|
|
||||||
const char *hostname, QIOChannel **outioc,
|
const char *hostname, QIOChannel **outioc,
|
||||||
NBDExportInfo *info, Error **errp)
|
NBDExportInfo *info, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -1027,7 +1026,7 @@ int nbd_receive_negotiate(AioContext *aio_context, QIOChannel *ioc,
|
||||||
assert(info->name && strlen(info->name) <= NBD_MAX_STRING_SIZE);
|
assert(info->name && strlen(info->name) <= NBD_MAX_STRING_SIZE);
|
||||||
trace_nbd_receive_negotiate_name(info->name);
|
trace_nbd_receive_negotiate_name(info->name);
|
||||||
|
|
||||||
result = nbd_start_negotiate(aio_context, ioc, tlscreds, hostname, outioc,
|
result = nbd_start_negotiate(NULL, ioc, tlscreds, hostname, outioc,
|
||||||
info->structured_reply, &zeroes, errp);
|
info->structured_reply, &zeroes, errp);
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -295,8 +295,8 @@ static void *nbd_client_thread(void *arg)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nbd_receive_negotiate(NULL, QIO_CHANNEL(sioc),
|
if (nbd_receive_negotiate(QIO_CHANNEL(sioc), NULL, NULL, NULL,
|
||||||
NULL, NULL, NULL, &info, &local_error) < 0) {
|
&info, &local_error) < 0) {
|
||||||
if (local_error) {
|
if (local_error) {
|
||||||
error_report_err(local_error);
|
error_report_err(local_error);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue