From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ1Io-0002UT-VA for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ1Ig-0002OL-45 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:47:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ1If-0002O3-Rb for qemu-devel@nongnu.org; Thu, 27 Feb 2014 08:46:58 -0500 Message-ID: <530F41CD.9090904@redhat.com> Date: Thu, 27 Feb 2014 06:46:53 -0700 From: Eric Blake MIME-Version: 1.0 References: <1393487858-2895-1-git-send-email-armbru@redhat.com> In-Reply-To: <1393487858-2895-1-git-send-email-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="NwSFAgvnsr1gRSDa0w591gMiRrdULjasu" Subject: Re: [Qemu-devel] [PATCH] qemu_file: Fix mismerge of "use fwrite() correctly" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, quintela@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --NwSFAgvnsr1gRSDa0w591gMiRrdULjasu Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Markus Armbruster > --- > qemu-file.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake >=20 > 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 uin= t8_t *buf, int64_t pos, > res =3D fwrite(buf, 1, size, s->stdio_file); > =20 > if (res !=3D size) { > - return -EIO; /* fake errno value */ > + return -errno; > } > return res; > } >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --NwSFAgvnsr1gRSDa0w591gMiRrdULjasu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTD0HNAAoJEKeha0olJ0NqdZcH/R4kjmMq8tVIhBSqM86aXm+x nz/pBXnyD9Xyc/NLyg72gM9FYsZiMq3HkQP6CrU2FJCwEGJAKdicmfbVQJMuqJSn EAaJO+ppYx2W6ugtoE53cZTlSpScz3QDxtVkd+S4tGCl82RAWcIWFrnEZvHWQEgX iX5d/pbDNQyXocz8eKs17WUZ33Nu1a1OTgAyZsmZTKDzDi+ZZMBSQBoN2eDdtdfR pBEl6tjTYsbjnI3Qa1Ig92dBtjJtKmMT/fX1RwZaoXQAf/MAULvKHeZm/HhJpy1p 3bnToX3HZWC9mJi3dx9/OhqzZqUX+ObcRChQXs+gxFjJsnhjmjGA7nDbip3Zg9w= =xTeE -----END PGP SIGNATURE----- --NwSFAgvnsr1gRSDa0w591gMiRrdULjasu--