From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJoYb-0004mN-Vz for qemu-devel@nongnu.org; Thu, 14 Jan 2016 15:31:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJoYb-00045z-06 for qemu-devel@nongnu.org; Thu, 14 Jan 2016 15:31:45 -0500 Sender: Paolo Bonzini References: <1452760863-25350-1-git-send-email-famz@redhat.com> <1452760863-25350-3-git-send-email-famz@redhat.com> <20160114172610.GE19340@redhat.com> From: Paolo Bonzini Message-ID: <569805A5.1080303@redhat.com> Date: Thu, 14 Jan 2016 21:31:33 +0100 MIME-Version: 1.0 In-Reply-To: <20160114172610.GE19340@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 2/3] nbd: Split nbd.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , Fam Zheng Cc: Kevin Wolf , qemu-devel@nongnu.org, qemu-block@nongnu.org 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 >> --- >> 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 > > 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