* [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly"
@ 2014-02-27 7:57 Markus Armbruster
2014-02-27 13:46 ` Eric Blake
2014-03-06 4:46 ` Amit Shah
0 siblings, 2 replies; 3+ messages in thread
From: Markus Armbruster @ 2014-02-27 7:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, quintela
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.
Signed-off-by: Markus Armbruster <armbru@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.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly"
2014-02-27 7:57 [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly" Markus Armbruster
@ 2014-02-27 13:46 ` Eric Blake
2014-03-06 4:46 ` Amit Shah
1 sibling, 0 replies; 3+ messages in thread
From: Eric Blake @ 2014-02-27 13:46 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: peter.maydell, quintela
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
On 02/27/2014 12:57 AM, Markus Armbruster wrote:
> 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.
Ouch.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> qemu-file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
>
> 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;
> }
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly"
2014-02-27 7:57 [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly" Markus Armbruster
2014-02-27 13:46 ` Eric Blake
@ 2014-03-06 4:46 ` Amit Shah
1 sibling, 0 replies; 3+ messages in thread
From: Amit Shah @ 2014-03-06 4:46 UTC (permalink / raw)
To: Markus Armbruster; +Cc: peter.maydell, qemu-devel, quintela
On (Thu) 27 Feb 2014 [08:57:38], Markus Armbruster wrote:
> 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.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
This fixes commit aded6539d983280212e08d09f14157b1cb4d58cc
Amit
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-06 4:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-27 7:57 [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly" Markus Armbruster
2014-02-27 13:46 ` Eric Blake
2014-03-06 4:46 ` Amit Shah
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).