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 (da...@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" <dgilb...@redhat.com> > > > > > > > > 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 <dgilb...@redhat.com> > > > > --- > > > > 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. > > 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.
--
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
pgpvPVfCzd0LR.pgp
Description: PGP signature
