From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBTwN-0007oZ-OQ for qemu-devel@nongnu.org; Fri, 10 Jun 2016 17:26:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBTwM-0001YS-JK for qemu-devel@nongnu.org; Fri, 10 Jun 2016 17:26:07 -0400 References: <1465574722-27656-1-git-send-email-kwolf@redhat.com> <1465574722-27656-3-git-send-email-kwolf@redhat.com> From: Eric Blake Message-ID: <575B3067.8090806@redhat.com> Date: Fri, 10 Jun 2016 15:25:59 -0600 MIME-Version: 1.0 In-Reply-To: <1465574722-27656-3-git-send-email-kwolf@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="53ru5uneob0Qjd02b8RCSDvjq5aXGacQD" Subject: Re: [Qemu-devel] [PATCH 2/6] block: Make .bdrv_load_vmstate() vectored List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: mreitz@redhat.com, qemu-devel@nongnu.org, famz@redhat.com, stefanha@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --53ru5uneob0Qjd02b8RCSDvjq5aXGacQD Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/10/2016 10:05 AM, Kevin Wolf wrote: > This brings it in line with .bdrv_save_vmstate(). >=20 > Signed-off-by: Kevin Wolf > --- > block/io.c | 26 +++++++++++++++++++++----- > block/qcow2.c | 6 +++--- > block/sheepdog.c | 13 ++++++++++--- > include/block/block.h | 1 + > include/block/block_int.h | 4 ++-- > 5 files changed, 37 insertions(+), 13 deletions(-) >=20 > diff --git a/block/io.c b/block/io.c > index 11510cf..602c7d3 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -1862,13 +1862,29 @@ int bdrv_writev_vmstate(BlockDriverState *bs, Q= EMUIOVector *qiov, int64_t pos) > int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf, > int64_t pos, int size) > { > + QEMUIOVector qiov; > + struct iovec iov =3D { > + .iov_base =3D buf, > + .iov_len =3D size, > + }; > + int ret; Dead variable. > + > + qemu_iovec_init_external(&qiov, &iov, 1); > + return bdrv_readv_vmstate(bs, &qiov, pos); > +} > + > +int bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64= _t pos) > +{ > BlockDriver *drv =3D bs->drv; > - if (!drv) > + > + if (!drv) { > return -ENOMEDIUM; > - if (drv->bdrv_load_vmstate) > - return drv->bdrv_load_vmstate(bs, buf, pos, size); > - if (bs->file) > - return bdrv_load_vmstate(bs->file->bs, buf, pos, size); > + } else if (drv->bdrv_load_vmstate) { > + return drv->bdrv_load_vmstate(bs, qiov, pos); > + } else if (bs->file) { > + return bdrv_readv_vmstate(bs->file->bs, qiov, pos); > + } Don't know that I would have used 'else if' after a return, but it's not wrong, so no need to change. With the dead 'ret' gone, Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --53ru5uneob0Qjd02b8RCSDvjq5aXGacQD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXWzBnAAoJEKeha0olJ0Nq3NgH/0Bi64U3d4JGnPP21vnVOLQk jj7jhWOQAGRWaGiqYmceUPOYxmFycbmSrEEHVjgrLZ2xm2K/JE/nDOEnZ5+5VxLc Y4c99iEJQQ1goGXWqeXD9iymZMXX/EaJdt+CRKagDsVOjOKjRo2mdwIx56bTWfde QzOzEnZpPYpiWdv+S3M2J3FYiBTAS6LP4I/S0LqUWsWVKxGS9g6D3fk9sV9W/ns+ m99OQbn+zCA+A9YnXpTKPhOFbLjmeOj1VfAbu39dwOdGaCLjCqymnPaugtPNXb5h XEjHPdMyQIfEKviRrqSRR2qAL8jUIgyUUZfeSaKaZpzai1ezNE0+sFjOFTiXuXo= =lkGB -----END PGP SIGNATURE----- --53ru5uneob0Qjd02b8RCSDvjq5aXGacQD--