david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io: Use qio_channel_has_feature() where applicable

Browse Source 
Parts of the code have been testing QIOChannel features directly with a
logical AND. This patch makes it all consistent by using the
qio_channel_has_feature() function to test if a feature is present.

Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Felipe Franciosi 2016-09-29 08:52:36 -07:00 committed by Daniel P. Berrange
parent 8fbf661212
commit e413ae0c04
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
io/channel-socket.c
View File

@ -403,7 +403,8 @@ static void qio_channel_socket_finalize(Object *obj)
QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj); QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj);
if (ioc->fd != -1) { if (ioc->fd != -1) {
if (QIO_CHANNEL(ioc)->features & (1 << QIO_CHANNEL_FEATURE_LISTEN)) { QIOChannel *ioc_local = QIO_CHANNEL(ioc);
if (qio_channel_has_feature(ioc_local, QIO_CHANNEL_FEATURE_LISTEN)) {
Error *err = NULL; Error *err = NULL;
socket_listen_cleanup(ioc->fd, &err); socket_listen_cleanup(ioc->fd, &err);

2
io/channel-tls.c
View File

@ -111,7 +111,7 @@ qio_channel_tls_new_client(QIOChannel *master,
ioc = QIO_CHANNEL(tioc); ioc = QIO_CHANNEL(tioc);
tioc->master = master; tioc->master = master;
if (master->features & (1 << QIO_CHANNEL_FEATURE_SHUTDOWN)) { if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) {
ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN); ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN);
} }
object_ref(OBJECT(master)); object_ref(OBJECT(master));

2
io/channel-websock.c
View File

@ -497,7 +497,7 @@ qio_channel_websock_new_server(QIOChannel *master)
ioc = QIO_CHANNEL(wioc); ioc = QIO_CHANNEL(wioc);
wioc->master = master; wioc->master = master;
if (master->features & (1 << QIO_CHANNEL_FEATURE_SHUTDOWN)) { if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) {
ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN); ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN);
} }
object_ref(OBJECT(master)); object_ref(OBJECT(master));

4
io/channel.c
View File

@ -40,7 +40,7 @@ ssize_t qio_channel_readv_full(QIOChannel *ioc,
QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);
if ((fds || nfds) && if ((fds || nfds) &&
!(ioc->features & (1 << QIO_CHANNEL_FEATURE_FD_PASS))) { !qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS)) {
error_setg_errno(errp, EINVAL, error_setg_errno(errp, EINVAL,
"Channel does not support file descriptor passing"); "Channel does not support file descriptor passing");
return -1; return -1;
@ -60,7 +60,7 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,
QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);
if ((fds || nfds) && if ((fds || nfds) &&
!(ioc->features & (1 << QIO_CHANNEL_FEATURE_FD_PASS))) { !qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS)) {
error_setg_errno(errp, EINVAL, error_setg_errno(errp, EINVAL,
"Channel does not support file descriptor passing"); "Channel does not support file descriptor passing");
return -1; return -1;