projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fd8cec9) | patch
qemu_file: Fix mismerge of "use fwrite() correctly"
authorMarkus Armbruster <armbru@redhat.com>
Thu, 6 Mar 2014 20:03:35 +0000 (01:33 +0530)
committerJuan Quintela <quintela@redhat.com>
Sat, 8 Mar 2014 21:22:34 +0000 (22:22 +0100)
commitac4df4e608e84da135eacecd7bba7c6e9e9a63b7
treecb474caecca2064c5e1e5d56126961b86492183ctree | snapshot
parentfd8cec932c2ddc687e2da954978954b46a926f90commit | diff
qemu_file: Fix mismerge of "use fwrite() correctly"

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>
Signed-off-by: Juan Quintela <quintela@redhat.com>
qemu-file.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.