OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-file: simplify and export qemu_ftell

Browse Source 
Force a flush when qemu_ftell is called.  This simplifies the buffer magic
(it also breaks qemu_ftell for input QEMUFiles, but we never use it).

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:40 +01:00 committed by Juan Quintela
parent 0cc3f3ccc9
commit 3f2d38faab
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
savevm.c
View File

@ -119,8 +119,8 @@ struct QEMUFile {
void *opaque; void *opaque;
int is_write; int is_write;
int64_t buf_offset; /* start of buffer when writing, end of buffer int64_t pos; /* start of buffer when writing, end of buffer
when reading */ when reading */
int buf_index; int buf_index;
int buf_size; /* 0 when writing */ int buf_size; /* 0 when writing */
uint8_t buf[IO_BUF_SIZE]; uint8_t buf[IO_BUF_SIZE];
@ -505,9 +505,9 @@ static void qemu_fflush(QEMUFile *f)
return; return;
} }
if (f->is_write && f->buf_index > 0) { if (f->is_write && f->buf_index > 0) {
ret = f->ops->put_buffer(f->opaque, f->buf, f->buf_offset, f->buf_index); ret = f->ops->put_buffer(f->opaque, f->buf, f->pos, f->buf_index);
if (ret >= 0) { if (ret >= 0) {
f->buf_offset += f->buf_index; f->pos += f->buf_index;
} }
f->buf_index = 0; f->buf_index = 0;
} }
@ -534,11 +534,11 @@ static void qemu_fill_buffer(QEMUFile *f)
f->buf_index = 0; f->buf_index = 0;
f->buf_size = pending; f->buf_size = pending;
len = f->ops->get_buffer(f->opaque, f->buf + pending, f->buf_offset, len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos,
IO_BUF_SIZE - pending); IO_BUF_SIZE - pending);
if (len > 0) { if (len > 0) {
f->buf_size += len; f->buf_size += len;
f->buf_offset += len; f->pos += len;
} else if (len == 0) { } else if (len == 0) {
qemu_file_set_error(f, -EIO); qemu_file_set_error(f, -EIO);
} else if (len != -EAGAIN) } else if (len != -EAGAIN)
@ -718,12 +718,8 @@ int qemu_get_byte(QEMUFile *f)
int64_t qemu_ftell(QEMUFile *f) int64_t qemu_ftell(QEMUFile *f)
{ {
/* buf_offset excludes buffer for writing but includes it for reading */ qemu_fflush(f);
if (f->is_write) { return f->pos;
return f->buf_offset + f->buf_index;
} else {
return f->buf_offset - f->buf_size + f->buf_index;
}
} }
int qemu_file_rate_limit(QEMUFile *f) int qemu_file_rate_limit(QEMUFile *f)