From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kurz Subject: Re: [PULL 0/21] Please pull xen-20170421-tag for 2.10 Date: Tue, 25 Apr 2017 08:44:08 +0200 Message-ID: <20170425084408.01948533@bahia> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3506906130633945882==" Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2uCz-0004Fi-Dn for xen-devel@lists.xenproject.org; Tue, 25 Apr 2017 06:44:21 +0000 Received: from player799.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 81779E9389 for ; Tue, 25 Apr 2017 08:44:19 +0200 (CEST) In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Stefano Stabellini Cc: Peter Maydell , Stefan Hajnoczi , QEMU Developers , "Aneesh Kumar K.V" , Stefan Hajnoczi , Anthony PERARD , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org --===============3506906130633945882== Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/eBIIoUBe0nBVapuCh=GxLiV"; protocol="application/pgp-signature" --Sig_/eBIIoUBe0nBVapuCh=GxLiV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Mon, 24 Apr 2017 16:44:53 -0700 (PDT) Stefano Stabellini wrote: > On Mon, 24 Apr 2017, Peter Maydell wrote: > > On 24 April 2017 at 22:25, Stefano Stabellini = wrote: =20 > > > 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 > > > + * > > > + */ =20 > >=20 > > 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). =20 >=20 > Sure >=20 > > > + > > > +#include > > > +#include "hw/xen/io/ring.h" > > > + > > > +DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs); =20 > >=20 > > Is it worth a comment to dissuade people from thinking they can > > inline the file back into xen-9p-backend.c ? =20 >=20 > Thanks for the quick review! Here you go: >=20 >=20 > 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 > - > -DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs); > =20 > #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 > + * > + * This work is licensed under the terms of the GNU GPL version 2. "version 2 or later" maybe ? > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include > +#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); --Sig_/eBIIoUBe0nBVapuCh=GxLiV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlj+8DgACgkQAvw66wEB28I0igCglZY58K2JXL7NYsLT5IpesXs2 YZUAnjmbqdsZbq+cvr2BWbGEjNmj1O8e =BB3/ -----END PGP SIGNATURE----- --Sig_/eBIIoUBe0nBVapuCh=GxLiV-- --===============3506906130633945882== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg== --===============3506906130633945882==--