diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-10 11:48:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-10 11:48:43 +0000 |
| commit | 16513b1b45a3fc6889c6173bc9a211a027a5ac0f (patch) | |
| tree | a574c5e8ae6b3906773303f6e80a7d55abc90e24 /qemu-file.c | |
| parent | f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71 (diff) | |
| parent | 464400f6a5583eafb466595add435a3a33ea980f (diff) | |
| download | qemu-16513b1b45a3fc6889c6173bc9a211a027a5ac0f.zip qemu-16513b1b45a3fc6889c6173bc9a211a027a5ac0f.tar.gz qemu-16513b1b45a3fc6889c6173bc9a211a027a5ac0f.tar.bz2 | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140308-1' into staging
migration/next for 20140308
# gpg: Signature made Sat 08 Mar 2014 21:26:01 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140308-1:
migration: extend section_start/end traces
vl: add system_wakeup_request tracepoint
qemu_file: Fix mismerge of "use fwrite() correctly"
XBZRLE: Fix qemu crash when resize the xbzrle cache
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-file.c')
| -rw-r--r-- | qemu-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-file.c b/qemu-file.c index f074af1..e5ec798 100644 --- a/qemu-file.c +++ b/qemu-file.c @@ -105,7 +105,7 @@ static int stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, res = fwrite(buf, 1, size, s->stdio_file); if (res != size) { - return -EIO; /* fake errno value */ + return -errno; } return res; } |