Rename
nbd_wr_syncv -> nbd_rwv
read_sync -> nbd_read
read_sync_eof -> nbd_read_eof
write_sync -> nbd_write
drop_sync -> nbd_drop
1. nbd_ prefix
read_sync and write_sync are already shared, so it is good to have a
namespace prefix. drop_sync will be shared, and read_sync_eof is
related to read_sync, so let's rename them all.
2. _sync suffix
_sync is related to the fact that nbd_wr_syncv doesn't return if a
write to socket returns EAGAIN. The first implementation of
nbd_wr_syncv (was wr_sync in 7a5ca8648b
) just loops while getting
EAGAIN, the current implementation yields in this case.
Why we want to get rid of it:
- it is normal for r/w functions to be synchronous, so having an
additional suffix for it looks redundant (contrariwise, we have
_aio suffix for async functions)
- _sync suffix in block layer is used when function does flush (so
using it for other thing is confusing a bit)
- keep function names short after adding nbd_ prefix
3. for nbd_wr_syncv let's use more common notation 'rw'
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20170602150150.258222-2-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
80 lines
2.3 KiB
C
80 lines
2.3 KiB
C
/*
|
|
* Copyright (C) 2005 Anthony Liguori <anthony@codemonkey.ws>
|
|
*
|
|
* Network Block Device Common Code
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; under version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "nbd-internal.h"
|
|
|
|
/* nbd_wr_syncv
|
|
* The function may be called from coroutine or from non-coroutine context.
|
|
* When called from non-coroutine context @ioc must be in blocking mode.
|
|
*/
|
|
ssize_t nbd_rwv(QIOChannel *ioc, struct iovec *iov, size_t niov, size_t length,
|
|
bool do_read, Error **errp)
|
|
{
|
|
ssize_t done = 0;
|
|
struct iovec *local_iov = g_new(struct iovec, niov);
|
|
struct iovec *local_iov_head = local_iov;
|
|
unsigned int nlocal_iov = niov;
|
|
|
|
nlocal_iov = iov_copy(local_iov, nlocal_iov, iov, niov, 0, length);
|
|
|
|
while (nlocal_iov > 0) {
|
|
ssize_t len;
|
|
if (do_read) {
|
|
len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);
|
|
} else {
|
|
len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);
|
|
}
|
|
if (len == QIO_CHANNEL_ERR_BLOCK) {
|
|
/* errp should not be set */
|
|
assert(qemu_in_coroutine());
|
|
qio_channel_yield(ioc, do_read ? G_IO_IN : G_IO_OUT);
|
|
continue;
|
|
}
|
|
if (len < 0) {
|
|
done = -EIO;
|
|
goto cleanup;
|
|
}
|
|
|
|
if (do_read && len == 0) {
|
|
break;
|
|
}
|
|
|
|
iov_discard_front(&local_iov, &nlocal_iov, len);
|
|
done += len;
|
|
}
|
|
|
|
cleanup:
|
|
g_free(local_iov_head);
|
|
return done;
|
|
}
|
|
|
|
|
|
void nbd_tls_handshake(QIOTask *task,
|
|
void *opaque)
|
|
{
|
|
struct NBDTLSHandshakeData *data = opaque;
|
|
|
|
if (qio_task_propagate_error(task, &data->error)) {
|
|
TRACE("TLS failed %s", error_get_pretty(data->error));
|
|
}
|
|
data->complete = true;
|
|
g_main_loop_quit(data->loop);
|
|
}
|