From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3mpm-0000wj-Uq for qemu-devel@nongnu.org; Wed, 24 Dec 2014 09:22:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3mpj-0006DI-Lj for qemu-devel@nongnu.org; Wed, 24 Dec 2014 09:22:42 -0500 Received: from ozlabs.org ([103.22.144.67]:47858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3mpj-0006D8-AR for qemu-devel@nongnu.org; Wed, 24 Dec 2014 09:22:39 -0500 Date: Thu, 25 Dec 2014 01:11:25 +1100 From: David Gibson Message-ID: <20141224141125.GB31457@voom> 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> <20141219132757.GY5002@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OwLcNYc0lM97+oe1" Content-Disposition: inline In-Reply-To: <20141219132757.GY5002@thinpad.lan.raisama.net> 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: Eduardo Habkost Cc: peter.maydell@linaro.org, quintela@redhat.com, stefanb@linux.vnet.ibm.com, "Dr. David Alan Gilbert" , qemu-devel@nongnu.org, joel.schopp@amd.com, amit.shah@redhat.com --OwLcNYc0lM97+oe1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 19, 2014 at 11:27:57AM -0200, Eduardo Habkost wrote: > On Thu, Dec 18, 2014 at 09:24:11AM +0000, 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" > > > >=20 > > > > The splitting of qemu-file and addition of the buffered file landed > > > > at the same time; so now split the buffered file code out. > > > >=20 > > > > 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 > > > >=20 > > > > 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 +=3D migration.o tcp.o > > > > common-obj-y +=3D vmstate.o > > > > -common-obj-y +=3D qemu-file.o qemu-file-unix.o qemu-file-stdio.o > > > > +common-obj-y +=3D qemu-file.o qemu-file-buf.o qemu-file-unix.o qem= u-file-stdio.o > > > > common-obj-y +=3D xbzrle.o > > > > =20 > > > > common-obj-$(CONFIG_RDMA) +=3D 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 > > >=20 > > > Bit hard to believe that only Fabrice listed on this file is correct, > > > given the buffered file stuff is fairly new. > >=20 > > 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. >=20 > This is often a problem when we split source files, as the copyright > notices are rarely updated when people add new code. IANAL, but copying > the existing copyright header from the original file seems to be the > most reasonable thing to do. If people are unhappy with the existing > copyright header, they can submit patches for it. Yeah, good point. > Perhaps we could add a note just below the copyright info, indicating > that the code was originally in ${ORIGINAL_FILE}.c, to help copyright > archaeologists from the future. That sounds like a good idea to me. --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --OwLcNYc0lM97+oe1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUmsmNAAoJEGw4ysog2bOSXOAP/0O+dFaXXaYrenqToCbpqtkQ 613NuimjOrqfP3gPM91/HIpk6kn0SYFBucQ2zUctJcJN7YlgXN0TWVOVWsa0N6io fWchGWjaJLoEmCVWy0P6/h4hKV+595u7doVjwuW73//KlHDEl4gMh+kVLhsxVxXg 8GAn3/bsxQwY73899n5snjiA728VHoKnA1eplcTSI1RApDvabT3tdjcXLo9rwNpi xwkyS8Z39QYElHZw+KzzpEeowOZFjyBoA2iRNYWDwPMsMXAQmqIPX8dVVVTGfTS/ 4+m7bh6BaBfb/CoDD+DFrCFIhFO/v0m1Ulvg8u+LQyIgHp6CkRoIAd3YapKnxqxD gbN8aXcWKiN7pwfe9qugsrHwqoj5e0ro6WI1iDvRy7idvI+S0SjBR15GtiOWOIrl uR3vuURWCa/Mcu7AVEaDUaYgcZ+qBRet7tVlnMcxURBWkaJ8nwJSDWNHmB/PfDi2 Nit5dIyUAQtRIvma7Lge3IVH1Hr7zXDnfNUOszH86su6QOKtZqsd89RUO956H7gU oCm4GBaBWPByjf+Qw6T3/12xMUkFY+WFPMQNgGqxlEbt0+biZR2tD6Hhte4ue0rd zDyoeMpSlAqGDGFUALst+uoso7jSX6JBYS/F3CBCDuq788uvbb7ufKER+XznhT7c vpozy3IPqdkQtcsnCBnK =2zhD -----END PGP SIGNATURE----- --OwLcNYc0lM97+oe1--