OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

savevm: Rename has_error to last_error field

Browse Source 
Now the field contains the last error name, so rename acordingly.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2011-10-05 01:05:21 +02:00
parent 624b9cc209
commit 3961b4dd0e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
savevm.c
View File

@ -173,7 +173,7 @@ struct QEMUFile {
int buf_size; /* 0 when writing */ int buf_size; /* 0 when writing */
uint8_t buf[IO_BUF_SIZE]; uint8_t buf[IO_BUF_SIZE];
int has_error; int last_error;
}; };
typedef struct QEMUFileStdio typedef struct QEMUFileStdio
@ -427,12 +427,12 @@ QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer,
int qemu_file_get_error(QEMUFile *f) int qemu_file_get_error(QEMUFile *f)
{ {
return f->has_error; return f->last_error;
} }
void qemu_file_set_error(QEMUFile *f, int ret) void qemu_file_set_error(QEMUFile *f, int ret)
{ {
f->has_error = ret; f->last_error = ret;
} }
void qemu_fflush(QEMUFile *f) void qemu_fflush(QEMUFile *f)
@ -447,7 +447,7 @@ void qemu_fflush(QEMUFile *f)
if (len > 0) if (len > 0)
f->buf_offset += f->buf_index; f->buf_offset += f->buf_index;
else else
f->has_error = -EINVAL; f->last_error = -EINVAL;
f->buf_index = 0; f->buf_index = 0;
} }
} }
@ -476,7 +476,7 @@ static void qemu_fill_buffer(QEMUFile *f)
f->buf_size += len; f->buf_size += len;
f->buf_offset += len; f->buf_offset += len;
} else if (len != -EAGAIN) } else if (len != -EAGAIN)
f->has_error = len; f->last_error = len;
} }
int qemu_fclose(QEMUFile *f) int qemu_fclose(QEMUFile *f)
@ -498,13 +498,13 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size)
{ {
int l; int l;
if (!f->has_error && f->is_write == 0 && f->buf_index > 0) { if (!f->last_error && f->is_write == 0 && f->buf_index > 0) {
fprintf(stderr, fprintf(stderr,
"Attempted to write to buffer while read buffer is not empty\n"); "Attempted to write to buffer while read buffer is not empty\n");
abort(); abort();
} }
while (!f->has_error && size > 0) { while (!f->last_error && size > 0) {
l = IO_BUF_SIZE - f->buf_index; l = IO_BUF_SIZE - f->buf_index;
if (l > size) if (l > size)
l = size; l = size;
@ -520,7 +520,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size)
void qemu_put_byte(QEMUFile *f, int v) void qemu_put_byte(QEMUFile *f, int v)
{ {
if (!f->has_error && f->is_write == 0 && f->buf_index > 0) { if (!f->last_error && f->is_write == 0 && f->buf_index > 0) {
fprintf(stderr, fprintf(stderr,
"Attempted to write to buffer while read buffer is not empty\n"); "Attempted to write to buffer while read buffer is not empty\n");
abort(); abort();