From: Amit Shah <amit.shah@redhat.com>
To: Juan Quintela <quintela@redhat.com>
Cc: aik@ozlabs.ru, Amit Shah <amit.shah@redhat.com>,
qemu list <qemu-devel@nongnu.org>,
Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH 1/4] qemu_file: Fix mismerge of "use fwrite() correctly"
Date: Fri, 7 Mar 2014 01:33:35 +0530 [thread overview]
Message-ID: <805f9ef9b4bf5580a5555dbc408d1e2646b47184.1394135904.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1394135904.git.amit.shah@redhat.com>
In-Reply-To: <cover.1394135904.git.amit.shah@redhat.com>
From: Markus Armbruster <armbru@redhat.com>
Reviewers accepted v2 of the patch, but what got committed was v1,
with the R-bys for v2. This is the v1->v2 followup fix.
[Amit:
This fixes commit aded6539d983280212e08d09f14157b1cb4d58cc
]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
qemu-file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
--
1.8.5.3
next prev parent reply other threads:[~2014-03-06 20:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-06 20:03 [Qemu-devel] [PULL] migration patches Amit Shah
2014-03-06 20:03 ` Amit Shah [this message]
2014-03-06 20:03 ` [Qemu-devel] [PATCH 2/4] vl: add system_wakeup_request tracepoint Amit Shah
2014-03-06 20:03 ` [Qemu-devel] [PATCH 3/4] migration: extend section_start/end traces Amit Shah
2014-03-06 20:03 ` [Qemu-devel] [PATCH 4/4] migration: add more traces Amit Shah
2014-03-07 11:10 ` [Qemu-devel] [PULL] migration patches Juan Quintela
2014-03-08 12:19 ` Peter Maydell
2014-03-08 12:48 ` Juan Quintela
2014-03-10 4:39 ` Amit Shah
2014-03-10 9:31 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=805f9ef9b4bf5580a5555dbc408d1e2646b47184.1394135904.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=aik@ozlabs.ru \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).