ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

savevm: unfold qemu_fclose_internal() 

It was used only one, and was only one if.  It makes error handling
saner.

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

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Juan Quintela 2012-08-29 19:14:54 +02:00
parent 7311bea33f
commit 29eee86f31
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
savevm.c
View File

@ -506,22 +506,6 @@ static void qemu_fill_buffer(QEMUFile *f)
qemu_file_set_error(f, len); qemu_file_set_error(f, len);
} }
/** Calls close function and set last_error if needed
*
* Internal function. qemu_fflush() must be called before this.
*
* Returns f->close() return value, or 0 if close function is not set.
*/
static int qemu_fclose_internal(QEMUFile *f)
{
int ret = 0;
if (f->close) {
ret = f->close(f->opaque);
qemu_file_set_if_error(f, ret);
}
return ret;
}
/** Closes the file /** Closes the file
* *
* Returns negative error value if any error happened on previous operations or * Returns negative error value if any error happened on previous operations or
@ -532,12 +516,14 @@ static int qemu_fclose_internal(QEMUFile *f)
*/ */
int qemu_fclose(QEMUFile *f) int qemu_fclose(QEMUFile *f)
{ {
int ret, ret2; int ret;
ret = qemu_fflush(f); ret = qemu_fflush(f);
ret2 = qemu_fclose_internal(f);
if (ret >= 0) { if (f->close) {
ret = ret2; int ret2 = f->close(f->opaque);
if (ret >= 0) {
ret = ret2;
}
} }
/* If any error was spotted before closing, we should report it /* If any error was spotted before closing, we should report it
* instead of the close() return value. * instead of the close() return value.