From patchwork Thu Oct 6 16:21:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/5] savevm: define qemu_get_byte() using qemu_peek_byte() From: Juan Quintela X-Patchwork-Id: 118125 Message-Id: <49696d43bab6d485d414cfe58772c9ac54926b63.1317911543.git.quintela@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 6 Oct 2011 18:21:38 +0200 Signed-off-by: Juan Quintela --- 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)