Re: [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly"

[Eric Blake <eblake@redhat.com>]

[-- 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 --]