Commit e413ae0c authored Sep 29, 2016 by Felipe Franciosi Committed by Daniel P. Berrangé Oct 26, 2016

io: Use qio_channel_has_feature() where applicable

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>

parent 8fbf6612

io/channel-socket.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,8 @@ static void qio_channel_socket_finalize(Object *obj)
		QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj);

		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;

		socket_listen_cleanup(ioc->fd, &err);

io/channel-tls.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ qio_channel_tls_new_client(QIOChannel *master,
		ioc = QIO_CHANNEL(tioc);

		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);
		}
		object_ref(OBJECT(master));

io/channel-websock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -497,7 +497,7 @@ qio_channel_websock_new_server(QIOChannel *master)
		ioc = QIO_CHANNEL(wioc);

		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);
		}
		object_ref(OBJECT(master));

io/channel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ ssize_t qio_channel_readv_full(QIOChannel *ioc,
		QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);

		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,
		"Channel does not support file descriptor passing");
		return -1;
		@@ -60,7 +60,7 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc,
		QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);

		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,
		"Channel does not support file descriptor passing");
		return -1;