commit 65f3bb3da3d5b46daebbfc54bd41ee493fdaba86
author Juan Quintela <quintela@redhat.com> Thu Oct 06 14:29:32 2011 +0200
committer Juan Quintela <quintela@redhat.com> Thu Oct 20 13:23:11 2011 +0200
tree 8ebac064f44fd69e366fd571e6bb469b4dbd49db
parent b9ce1454e14ec918acb90d899ce7724f69682f45

savevm: define qemu_get_byte() using qemu_peek_byte()

Signed-off-by: Juan Quintela<quintela@redhat.com>

savevm.c

diff --git a/savevm.c b/savevm.c
index 6e4bb3a..0380999 100644
--- a/savevm.c
+++ b/savevm.c
@@ -578,17 +578,14 @@
 
 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)