[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/4] savevm: some coding style cleanups
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 2/4] savevm: some coding style cleanups |
Date: |
Tue, 4 Oct 2011 16:38:13 +0200 |
This patch will make moving code on next patches and having checkpatch
happy easier.
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/savevm.c b/savevm.c
index 31131df..5fee4e2 100644
--- a/savevm.c
+++ b/savevm.c
@@ -536,8 +536,9 @@ int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size1)
{
int size, l;
- if (f->is_write)
+ if (f->is_write) {
abort();
+ }
size = size1;
while (size > 0) {
@@ -545,11 +546,13 @@ int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size1)
if (l == 0) {
qemu_fill_buffer(f);
l = f->buf_size - f->buf_index;
- if (l == 0)
+ if (l == 0) {
break;
+ }
}
- if (l > size)
+ if (l > size) {
l = size;
+ }
memcpy(buf, f->buf + f->buf_index, l);
f->buf_index += l;
buf += l;
@@ -560,26 +563,30 @@ int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size1)
static int qemu_peek_byte(QEMUFile *f)
{
- if (f->is_write)
+ if (f->is_write) {
abort();
+ }
if (f->buf_index >= f->buf_size) {
qemu_fill_buffer(f);
- if (f->buf_index >= f->buf_size)
+ if (f->buf_index >= f->buf_size) {
return 0;
+ }
}
return f->buf[f->buf_index];
}
int qemu_get_byte(QEMUFile *f)
{
- if (f->is_write)
+ if (f->is_write) {
abort();
+ }
if (f->buf_index >= f->buf_size) {
qemu_fill_buffer(f);
- if (f->buf_index >= f->buf_size)
+ if (f->buf_index >= f->buf_size) {
return 0;
+ }
}
return f->buf[f->buf_index++];
}
--
1.7.6.4
- [Qemu-devel] [PATCH 0/4] migration: Improve subsections detection, Juan Quintela, 2011/10/04
- [Qemu-devel] [PATCH 1/4] savevm: teach qemu_fill_buffer to do partial refills, Juan Quintela, 2011/10/04
- [Qemu-devel] [PATCH 2/4] savevm: some coding style cleanups,
Juan Quintela <=
- [Qemu-devel] [PATCH 4/4] Revert "savevm: fix corruption in vmstate_subsection_load().", Juan Quintela, 2011/10/04
- [Qemu-devel] [PATCH 3/4] savevm: improve subsections detection on load, Juan Quintela, 2011/10/04
- Re: [Qemu-devel] [PATCH 0/4] migration: Improve subsections detection, Paolo Bonzini, 2011/10/04
- Re: [Qemu-devel] [PATCH 0/4] migration: Improve subsections detection, Avi Kivity, 2011/10/04