Re: [Qemu-devel] [PATCH 2/3] block/nbd: merge nbd-client.* to nbd.c

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1704 bytes --]

On 6/11/19 5:27 AM, Vladimir Sementsov-Ogievskiy wrote:
> No reason of keeping driver handlers realization in separate of driver
> structure. We can get rid of extra header file.
> 
> While being here, fix comments style, restore forgotten comments for
> NBD_FOREACH_REPLY_CHUNK and nbd_reply_chunk_iter_receive, remove extra
> includes.

It's a little bit harder to review for accuracy when the patch does
cleanups at the same time; but this shows that the patch is fairly
simple to understand:

$ diff -u <(git log -p -1 | sed -n 's/^-//p') <(git log -p -1 | sed -n
's/^\+//p')

the most confusing parts were that HANDLE_TO_INDEX/INDEX_TO_HANDLE moved
differently from nbd_get_client_session(), and
nbd_client_{attach,detach}_aio_conext moved to a different relative
position.  Perhaps the patch could have been split to make the code
motion even easier to follow, but it's not worth respinning now.

> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  block/nbd-client.h  |   63 ---
>  block/nbd-client.c  | 1226 -----------------------------------------
>  block/nbd.c         | 1285 +++++++++++++++++++++++++++++++++++++++++--
>  block/Makefile.objs |    2 +-
>  block/trace-events  |    2 +-
>  5 files changed, 1255 insertions(+), 1323 deletions(-)
>  delete mode 100644 block/nbd-client.h
>  delete mode 100644 block/nbd-client.c

Reviewed-by: Eric Blake <eblake@redhat.com>

This will tend to cause merge conflicts to anything else touching either
file, so I plan to send a pull request soon.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]