mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability

Browse Source 
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
This commit is contained in:
Leonardo Bras 2022-06-20 02:39:42 -03:00 committed by Dr. David Alan Gilbert
parent f6f213e4c7
commit 803ca43e4c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
io/channel-socket.c
View File

@ -578,11 +578,17 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
memcpy(CMSG_DATA(cmsg), fds, fdsize); memcpy(CMSG_DATA(cmsg), fds, fdsize);
} }
#ifdef QEMU_MSG_ZEROCOPY
if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) { if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) {
#ifdef QEMU_MSG_ZEROCOPY
sflags = MSG_ZEROCOPY; sflags = MSG_ZEROCOPY;
} #else
/*
* We expect QIOChannel class entry point to have
* blocked this code path already
*/
g_assert_not_reached();
#endif #endif
}
retry: retry:
ret = sendmsg(sioc->fd, &msg, sflags); ret = sendmsg(sioc->fd, &msg, sflags);
@ -592,15 +598,13 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
return QIO_CHANNEL_ERR_BLOCK; return QIO_CHANNEL_ERR_BLOCK;
case EINTR: case EINTR:
goto retry; goto retry;
#ifdef QEMU_MSG_ZEROCOPY
case ENOBUFS: case ENOBUFS:
if (sflags & MSG_ZEROCOPY) { if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) {
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"Process can't lock enough memory for using MSG_ZEROCOPY"); "Process can't lock enough memory for using MSG_ZEROCOPY");
return -1; return -1;
} }
break; break;
#endif
} }
error_setg_errno(errp, errno, error_setg_errno(errp, errno,