diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
| commit | fdef621b5810cf8d6715e04d883a0f3523873014 (patch) | |
| tree | e6979f169764792f0ebd75596dd90f454aca4510 /savevm.c | |
| parent | cc92186773df8c9aae8f812fff85e7325e1d7583 (diff) | |
| parent | 58c8cce21c13bddd332590fb1fd9a5c369975d3f (diff) | |
| download | focaccia-qemu-fdef621b5810cf8d6715e04d883a0f3523873014.tar.gz focaccia-qemu-fdef621b5810cf8d6715e04d883a0f3523873014.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: qemu-iotests: Fix 030 after switch to GenericError block: Flush parent to OS with cache=unsafe iscsi: Fix NULL dereferences / races between task completion and abort monitor: Clean up fd sets on monitor disconnect block: Enable qemu_open/close to work with fd sets block: Convert close calls to qemu_close block: Convert open calls to qemu_open block: Prevent detection of /dev/fdset/ as floppy qapi: Introduce add-fd, remove-fd, query-fdsets qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
Diffstat (limited to 'savevm.c')
| -rw-r--r-- | savevm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/savevm.c b/savevm.c index 0ea10c9b66..f002bfc48d 100644 --- a/savevm.c +++ b/savevm.c @@ -513,7 +513,7 @@ static void qemu_fill_buffer(QEMUFile *f) * * Returns f->close() return value, or 0 if close function is not set. */ -static int qemu_close(QEMUFile *f) +static int qemu_fclose_internal(QEMUFile *f) { int ret = 0; if (f->close) { @@ -535,7 +535,7 @@ int qemu_fclose(QEMUFile *f) { int ret; qemu_fflush(f); - ret = qemu_close(f); + ret = qemu_fclose_internal(f); /* If any error was spotted before closing, we should report it * instead of the close() return value. */ |