From: Juan Quintela <quintela@redhat.com>
Date: Thu, 6 Oct 2011 12:29:32 +0000 (+0200)
Subject: savevm: define qemu_get_byte() using qemu_peek_byte()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=65f3bb3da3d5b46daebbfc54bd41ee493fdaba86;p=qemu.git

savevm: define qemu_get_byte() using qemu_peek_byte()

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

diff --git a/savevm.c b/savevm.c
index 6e4bb3a3df..038099979e 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)