[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 2/3] nbd: Split nbd.c
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v3 2/3] nbd: Split nbd.c |
Date: |
Thu, 14 Jan 2016 21:31:33 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 |
On 14/01/2016 18:26, Daniel P. Berrange wrote:
> On Thu, Jan 14, 2016 at 04:41:02PM +0800, Fam Zheng wrote:
>> We have NBD server code and client code, all mixed in a file. Now split
>> them into separate files under nbd/, and update MAINTAINERS.
>>
>> filter_nbd for iotest 083 is updated to keep the log filtered out.
>>
>> Signed-off-by: Fam Zheng <address@hidden>
>> ---
>> MAINTAINERS | 5 +-
>> Makefile.objs | 3 +-
>> include/block/nbd-internal.h | 113 +++++++++++
>> nbd/Makefile.objs | 1 +
>> nbd/client.c | 361 ++++++++++++++++++++++++++++++++++
>> nbd/common.c | 64 ++++++
>> nbd.c => nbd/server.c | 451
>> +------------------------------------------
>> tests/qemu-iotests/083 | 2 +-
>> 8 files changed, 547 insertions(+), 453 deletions(-)
>> create mode 100644 include/block/nbd-internal.h
>> create mode 100644 nbd/Makefile.objs
>> create mode 100644 nbd/client.c
>> create mode 100644 nbd/common.c
>> rename nbd.c => nbd/server.c (68%)
>
> Reviewed-by: Daniel P. Berrange <address@hidden>
>
> Splitting this up is well overdue. Though this will conflict
> horribly with my TLS series, that's not the end of the world
> if Paolo wishes to merge this quickly.
Your TLS patches are being held mostly by qemu-io/img/nbd QOM command
line support. I suspect that just using "patch -p1" on both
nbd/client.c and nbd/server.c will solve most conflicts correctly.
The only issue I have with Fam's patch is that nbd-internal.h should be
in nbd/ (it's not used outside it), but that's a very minor thing that I
can handle when merging.
Paolo