virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <amit.shah@redhat.com>
To: Virtualization List <virtualization@lists.linux-foundation.org>
Cc: Amit Shah <amit.shah@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH 10/11] virtio: console: Rename wait_is_over() to will_read_block()
Date: Thu,  8 Apr 2010 20:19:39 +0530	[thread overview]
Message-ID: <1270738180-21170-11-git-send-email-amit.shah@redhat.com> (raw)
In-Reply-To: <1270738180-21170-10-git-send-email-amit.shah@redhat.com>

We'll introduce a function that checks if write will block.  Have
function names that are similar for the two cases.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 drivers/char/virtio_console.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 567acbd..03d9229 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -479,9 +479,9 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
 }
 
 /* The condition that must be true for polling to end */
-static bool wait_is_over(struct port *port)
+static bool will_read_block(struct port *port)
 {
-	return port_has_data(port) || !port->host_connected;
+	return !port_has_data(port) && port->host_connected;
 }
 
 static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
@@ -504,7 +504,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
 			return -EAGAIN;
 
 		ret = wait_event_interruptible(port->waitqueue,
-					       wait_is_over(port));
+					       !will_read_block(port));
 		if (ret < 0)
 			return ret;
 	}
-- 
1.6.2.5

  reply	other threads:[~2010-04-08 14:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-08 14:49 [PATCH 00/11] (v6) virtio: console: Fixes, new way of discovering ports Amit Shah
2010-04-08 14:49 ` [PATCH 01/11] Revert "virtio: disable multiport console support." Amit Shah
2010-04-08 14:49   ` [PATCH 02/11] virtio: console: Add a __send_control_msg() that can send messages without a valid port Amit Shah
2010-04-08 14:49     ` [PATCH 03/11] virtio: console: Let host know of port or device add failures Amit Shah
2010-04-08 14:49       ` [PATCH 04/11] virtio: console: Return -EPIPE to hvc_console if we lost the connection Amit Shah
2010-04-08 14:49         ` [PATCH 05/11] virtio: console: Don't call hvc_remove() on unplugging console ports Amit Shah
2010-04-08 14:49           ` [PATCH 06/11] virtio: console: Remove config work handler Amit Shah
2010-04-08 14:49             ` [PATCH 07/11] virtio: console: Move code around for future patches Amit Shah
2010-04-08 14:49               ` [PATCH 08/11] virtio: console: Use a control message to add ports Amit Shah
2010-04-08 14:49                 ` [PATCH 09/11] virtio: console: Don't always create a port 0 if using multiport Amit Shah
2010-04-08 14:49                   ` Amit Shah [this message]
2010-04-08 14:49                     ` [PATCH 11/11] virtio: console: Add support for nonblocking write()s Amit Shah
2010-04-10  7:19                   ` [PATCH 09/11] virtio: console: Don't always create a port 0 if using multiport Amit Shah

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270738180-21170-11-git-send-email-amit.shah@redhat.com \
    --to=amit.shah@redhat.com \
    --cc=mst@redhat.com \
    --cc=quintela@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).