Re: [Qemu-devel] [PATCH v3 4/5] Split the QEMU buffered file code out

[Dr. David Alan Gilbert]

* David Gibson (address@hidden) wrote:
> On Fri, Dec 12, 2014 at 11:13:41AM +0000, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <address@hidden>
> > 
> > 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 <address@hidden>
> > ---
> >  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.

The ordering here as far as I can tell is:

   Stefan Berger posted it originally around March 2013
     Their patch series included a patch to split chunks of savevm.c out
     into *util*/qemu-file.c and then added this code to that.
     They kept Fabrice's copyright unchanged in their util/qemu-file.c 
     ( http://lists.gnu.org/archive/html/qemu-devel/2013-03/msg03869.html )
     These changes didn't go in.

   Eduardo Habkost split qemu-file.c out of savevm.c November 2013
     but forgot to move the copyright header over
     ( 093c455a8 )

   Eduardo Habkost added the copyright header to qemu-file.c 1st October 2014
     ( 9a4ac51f )

   My merge of Stefan and Joel's code (with my changes) goes in 10th October 
2014
     ( deb22f9a446 )

   This split went in 12th December 2014
     ( 977184d )

Dave

> 
> -- 
> 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


--
Dr. David Alan Gilbert / address@hidden / Manchester, UK