diff options
| author | Leonardo Bras <leobras@redhat.com> | 2022-06-20 02:39:42 -0300 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2022-06-22 17:22:09 +0100 |
| commit | 803ca43e4c7fcf32f9f68c118301ccd0c83ece3f (patch) | |
| tree | d7f834ee6a8618f2bb5ca8cfd12ad47c16036d20 /io | |
| parent | f6f213e4c713c4a6c3f9de775aa526f2288e3d2d (diff) | |
| download | qemu-803ca43e4c7fcf32f9f68c118301ccd0c83ece3f.zip qemu-803ca43e4c7fcf32f9f68c118301ccd0c83ece3f.tar.gz qemu-803ca43e4c7fcf32f9f68c118301ccd0c83ece3f.tar.bz2 | |
QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability
During implementation of MSG_ZEROCOPY feature, a lot of #ifdefs were
introduced, particularly at qio_channel_socket_writev().
Rewrite some of those changes so it's easier to read.
Also, introduce an assert to help detect incorrect zero-copy usage is when
it's disabled on build.
Signed-off-by: Leonardo Bras <leobras@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
dgilbert: Fixed up thinko'd g_assert_unreachable->g_assert_not_reached
Diffstat (limited to 'io')
| -rw-r--r-- | io/channel-socket.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c index dc9c165..b8c13db 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -578,11 +578,17 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc, memcpy(CMSG_DATA(cmsg), fds, fdsize); } -#ifdef QEMU_MSG_ZEROCOPY if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) { +#ifdef QEMU_MSG_ZEROCOPY sflags = MSG_ZEROCOPY; - } +#else + /* + * We expect QIOChannel class entry point to have + * blocked this code path already + */ + g_assert_not_reached(); #endif + } retry: ret = sendmsg(sioc->fd, &msg, sflags); @@ -592,15 +598,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc, return QIO_CHANNEL_ERR_BLOCK; case EINTR: goto retry; -#ifdef QEMU_MSG_ZEROCOPY case ENOBUFS: - if (sflags & MSG_ZEROCOPY) { + if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) { error_setg_errno(errp, errno, "Process can't lock enough memory for using MSG_ZEROCOPY"); return -1; } break; -#endif } error_setg_errno(errp, errno, |