[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] savevm: define qemu_get_byte() using qemu_peek_
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/5] savevm: define qemu_get_byte() using qemu_peek_byte() |
Date: |
Sun, 9 Oct 2011 21:50:01 +0200 |
Signed-off-by: Juan Quintela<address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/savevm.c b/savevm.c
index 4069b34..94628c6 100644
--- a/savevm.c
+++ b/savevm.c
@@ -578,17 +578,14 @@ static int qemu_peek_byte(QEMUFile *f)
int qemu_get_byte(QEMUFile *f)
{
- if (f->is_write) {
- abort();
- }
+ int result;
- if (f->buf_index >= f->buf_size) {
- qemu_fill_buffer(f);
- if (f->buf_index >= f->buf_size) {
- return 0;
- }
+ result = qemu_peek_byte(f);
+
+ if (f->buf_index < f->buf_size) {
+ f->buf_index++;
}
- return f->buf[f->buf_index++];
+ return result;
}
int64_t qemu_ftell(QEMUFile *f)
--
1.7.6.4