On 08/04/2017 10:14 AM, Vladimir Sementsov-Ogievskiy wrote:
> Move nbd_co_receive_reply and nbd_coroutine_end calls into
> nbd_co_send_request and rename the latter to just nbd_co_request.
>
> This removes code duplications in nbd_client_co_{pwrite,pread,...}
> functions. Also this is needed for further refactoring.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
> ---
> block/nbd-client.c | 89
> ++++++++++++++++++++----------------------------------
> 1 file changed, 33 insertions(+), 56 deletions(-)The diffstat shows this is a nice improvement. > +++ b/block/nbd-client.c > @@ -112,12 +112,20 @@ static coroutine_fn void nbd_read_reply_entry(void > *opaque) > s->read_reply_co = NULL; > } > > -static int nbd_co_send_request(BlockDriverState *bs, > - NBDRequest *request, > - QEMUIOVector *qiov) > +static void nbd_co_receive_reply(NBDClientSession *s, > + NBDRequest *request, > + NBDReply *reply, > + QEMUIOVector *qiov); > +static void nbd_coroutine_end(BlockDriverState *bs, > + NBDRequest *request); Is it possible to organize the functions in topological order so that we don't need forward declarations of static functions? (If there is mutual recursion, you need the forward declaration; but other than that, I like reading the building blocks first rather than skipping around) Otherwise, Reviewed-by: Eric Blake <[email protected]> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
