From: Amit Shah <amit.shah@redhat.com>
To: qemu list <qemu-devel@nongnu.org>
Cc: Amit Shah <amit.shah@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Paul Brook <paul@codesourcery.com>
Subject: [Qemu-devel] [PATCH 5/7] virtio-serial: Let virtio-serial-bus know if all data was consumed
Date: Wed, 19 Jan 2011 17:57:17 +0530 [thread overview]
Message-ID: <ab338e30349ae369ff07fd260329adf555a5817f.1295439749.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1295439749.git.amit.shah@redhat.com>
In-Reply-To: <cover.1295439749.git.amit.shah@redhat.com>
The have_data() API to hand off guest data to apps using virtio-serial
so far assumed all the data was consumed. Relax this assumption.
Future commits will allow for incomplete writes.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
hw/virtio-console.c | 4 ++--
hw/virtio-serial.h | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index d0b9354..62624ec 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -20,11 +20,11 @@ typedef struct VirtConsole {
/* Callback function that's called when the guest sends us data */
-static void flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
+static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
{
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
- qemu_chr_write(vcon->chr, buf, len);
+ return qemu_chr_write(vcon->chr, buf, len);
}
/* Readiness of the guest to accept data on a port */
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index ff08c40..9cc0fb3 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -137,10 +137,11 @@ struct VirtIOSerialPortInfo {
/*
* Guest wrote some data to the port. This data is handed over to
- * the app via this callback. The app is supposed to consume all
- * the data that is presented to it.
+ * the app via this callback. The app can return a size less than
+ * 'len'. In this case, throttling will be enabled for this port.
*/
- void (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, size_t len);
+ ssize_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf,
+ size_t len);
};
/* Interface to the virtio-serial bus */
--
1.7.3.4
next prev parent reply other threads:[~2011-01-19 12:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-19 12:27 [Qemu-devel] [PATCH 0/7] virtio-serial: Don't copy guest buf to host, flow control Amit Shah
2011-01-19 12:27 ` [Qemu-devel] [PATCH 1/7] virtio-console: Factor out common init between console and generic ports Amit Shah
2011-01-19 12:27 ` [Qemu-devel] [PATCH 2/7] virtio-console: Remove unnecessary braces Amit Shah
2011-01-19 12:27 ` [Qemu-devel] [PATCH 3/7] virtio-serial-bus: separate out discard logic in a separate function Amit Shah
2011-01-19 12:27 ` [Qemu-devel] [PATCH 4/7] virtio-serial: Don't copy over guest buffer to host Amit Shah
2011-01-19 12:27 ` Amit Shah [this message]
2011-01-19 12:27 ` [Qemu-devel] [PATCH 6/7] virtio-serial: Add support for flow control Amit Shah
2011-01-19 12:27 ` [Qemu-devel] [PATCH 7/7] virtio-serial: save/restore new fields in port struct 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=ab338e30349ae369ff07fd260329adf555a5817f.1295439749.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=kraxel@redhat.com \
--cc=paul@codesourcery.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/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).