From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBmt4-0000rn-L7 for qemu-devel@nongnu.org; Thu, 15 Jan 2015 11:03:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBmsz-0005ag-MJ for qemu-devel@nongnu.org; Thu, 15 Jan 2015 11:03:10 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:33576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBmsz-0005ZS-93 for qemu-devel@nongnu.org; Thu, 15 Jan 2015 11:03:05 -0500 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Jan 2015 09:03:02 -0700 Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 7201619D8048 for ; Thu, 15 Jan 2015 08:54:11 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0FG1jcI29360192 for ; Thu, 15 Jan 2015 09:01:45 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0FG2wc8023774 for ; Thu, 15 Jan 2015 09:02:59 -0700 Message-ID: <54B7E4AF.5000305@linux.vnet.ibm.com> Date: Thu, 15 Jan 2015 11:02:55 -0500 From: Stefan Berger MIME-Version: 1.0 References: <1418382822-25151-1-git-send-email-dgilbert@redhat.com> <1418382822-25151-5-git-send-email-dgilbert@redhat.com> <20141218011309.GD12159@voom.redhat.com> <20141218092410.GC4744@work-vm> In-Reply-To: <20141218092410.GC4744@work-vm> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 4/5] Split the QEMU buffered file code out List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" , David Gibson Cc: peter.maydell@linaro.org, ehabkost@redhat.com, joel.schopp@amd.com, quintela@redhat.com, qemu-devel@nongnu.org, amit.shah@redhat.com On 12/18/2014 04:24 AM, Dr. David Alan Gilbert wrote: > * David Gibson (david@gibson.dropbear.id.au) wrote: >> On Fri, Dec 12, 2014 at 11:13:41AM +0000, Dr. David Alan Gilbert (git) wrote: >>> From: "Dr. David Alan Gilbert" >>> >>> The splitting of qemu-file and addition of the buffered file landed >>> at the same time; so now split the buffered file code out. >>> >>> Signed-off-by: Dr. David Alan Gilbert >>> --- >>> migration/Makefile.objs | 2 +- >>> migration/qemu-file-buf.c | 486 ++++++++++++++++++++++++++++++++++++++++++++++ >>> migration/qemu-file.c | 455 ------------------------------------------- >>> tests/Makefile | 3 +- >>> 4 files changed, 489 insertions(+), 457 deletions(-) >>> create mode 100644 migration/qemu-file-buf.c >>> >>> diff --git a/migration/Makefile.objs b/migration/Makefile.objs >>> index ce1e3c7..d929e96 100644 >>> --- a/migration/Makefile.objs >>> +++ b/migration/Makefile.objs >>> @@ -1,6 +1,6 @@ >>> common-obj-y += migration.o tcp.o >>> common-obj-y += vmstate.o >>> -common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o >>> +common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o >>> common-obj-y += xbzrle.o >>> >>> common-obj-$(CONFIG_RDMA) += rdma.o >>> diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c >>> new file mode 100644 >>> index 0000000..d33dd44 >>> --- /dev/null >>> +++ b/migration/qemu-file-buf.c >>> @@ -0,0 +1,486 @@ >>> +/* >>> + * QEMU System Emulator >>> + * >>> + * Copyright (c) 2003-2008 Fabrice Bellard >> Bit hard to believe that only Fabrice listed on this file is correct, >> given the buffered file stuff is fairly new. > Yes, I'd be happy to add Stefan and Joel's name to that, although > they never added it in their original patch, and when splitting files > we do normally take the copyright header from what we split out of; > but you are right it's misleading. I'll add IBM as an additional copyright holder to the qemu-file-buf.c and myself as an author. Whoever else wants to be added as an author, either let me know or submit a patch. Stefan