Re: [Xen-devel] [Qemu-devel] [PULL 0/21] Please pull xen-20170421-tag for 2.10

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Tue, 25 Apr 2017, Markus Armbruster wrote:
> Stefano Stabellini <sstabellini@xxxxxxxxxx> writes:
> 
> > On Mon, 24 Apr 2017, Peter Maydell wrote:
> >> On 24 April 2017 at 22:25, Stefano Stabellini <sstabellini@xxxxxxxxxx> 
> >> wrote:
> >> > diff --git a/hw/9pfs/xen-9pfs.h b/hw/9pfs/xen-9pfs.h
> >> > new file mode 100644
> >> > index 0000000..18f0ec0
> >> > --- /dev/null
> >> > +++ b/hw/9pfs/xen-9pfs.h
> >> > @@ -0,0 +1,14 @@
> >> > +/*
> >> > + * Xen 9p backend
> >> > + *
> >> > + * Copyright Aporeto 2017
> >> > + *
> >> > + * Authors:
> >> > + *  Stefano Stabellini <stefano@xxxxxxxxxxx>
> >> > + *
> >> > + */
> >> 
> >> Trivial file, but I prefer it if we have a brief license
> >> statement in every file, just to be clear (it might
> >> accumulate more code later).
> >
> > Sure
> >
> >> > +
> >> > +#include <xen/io/protocols.h>
> >> > +#include "hw/xen/io/ring.h"
> >> > +
> >> > +DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
> >> 
> >> Is it worth a comment to dissuade people from thinking they can
> >> inline the file back into xen-9p-backend.c ?
> >
> > Thanks for the quick review! Here you go:
> >
> >
> > diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
> > index 7e962aa..9c7f41a 100644
> > --- a/hw/9pfs/xen-9p-backend.c
> > +++ b/hw/9pfs/xen-9p-backend.c
> > @@ -13,12 +13,9 @@
> >  #include "hw/hw.h"
> >  #include "hw/9pfs/9p.h"
> >  #include "hw/xen/xen_backend.h"
> > -#include "hw/xen/io/ring.h"
> > +#include "hw/9pfs/xen-9pfs.h"
> >  #include "qemu/config-file.h"
> >  #include "fsdev/qemu-fsdev.h"
> > -#include <xen/io/protocols.h>
> > -
> > -DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
> >  
> >  #define VERSIONS "1"
> >  #define MAX_RINGS 8
> > diff --git a/hw/9pfs/xen-9pfs.h b/hw/9pfs/xen-9pfs.h
> > new file mode 100644
> > index 0000000..6e33d77
> > --- /dev/null
> > +++ b/hw/9pfs/xen-9pfs.h
> > @@ -0,0 +1,21 @@
> > +/*
> > + * Xen 9p backend
> > + *
> > + * Copyright Aporeto 2017
> > + *
> > + * Authors:
> > + *  Stefano Stabellini <stefano@xxxxxxxxxxx>
> > + *
> > + * This work is licensed under the terms of the GNU GPL version 2.
> 
> Any particular reason for "version 2" instead of "version 2 or later"?

Habit: both Linux and Xen are v2 only. I didn't realize that QEMU is "or
later". Also, personally I don't like the "or later" clause for a number
of reasons that is best not to discuss in this thread :-)

But I'll go with whatever is easier for the project. I'll add "or later"
and merge this change into patch #12.

 
> > + * See the COPYING file in the top-level directory.
> > + *
> > + */
> > +
> > +#include <xen/io/protocols.h>
> > +#include "hw/xen/io/ring.h"
> > +
> > +/*
> > + * Do not merge into xen-9p-backend.c: clang doesn't allow unused static
> > + * inline functions in c files.
> > + */
> > +DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs);
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel