diff options
author | David Turner <digit@android.com> | 2010-09-09 21:16:39 +0200 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
commit | a12820ef4aff2e2f6d3db9b704abee2c54d08f40 (patch) | |
tree | e8d837fbbf37c83a52fabaeb2febee1d4dd59a0c /buffered_file.c | |
parent | b8fec3e556b0d1b2a66c76d6ec0a9b242baa1068 (diff) | |
download | external_qemu-a12820ef4aff2e2f6d3db9b704abee2c54d08f40.zip external_qemu-a12820ef4aff2e2f6d3db9b704abee2c54d08f40.tar.gz external_qemu-a12820ef4aff2e2f6d3db9b704abee2c54d08f40.tar.bz2 |
upstream: buffered file minor change.
Diffstat (limited to 'buffered_file.c')
-rw-r--r-- | buffered_file.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/buffered_file.c b/buffered_file.c index 641ce21..1836e7e 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -156,6 +156,14 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in offset = size; } + if (pos == 0 && size == 0) { + DPRINTF("file is ready\n"); + if (s->bytes_xfer <= s->xfer_limit) { + DPRINTF("notifying client\n"); + s->put_ready(s->opaque); + } + } + return offset; } @@ -222,8 +230,10 @@ static void buffered_rate_tick(void *opaque) { QEMUFileBuffered *s = opaque; - if (s->has_error) + if (s->has_error) { + buffered_close(s); return; + } qemu_mod_timer(s->timer, qemu_get_clock(rt_clock) + 100); @@ -258,7 +268,8 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, - buffered_set_rate_limit); + buffered_set_rate_limit, + buffered_get_rate_limit); s->timer = qemu_new_timer(rt_clock, buffered_rate_tick, s); |