From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNOJR-0006zv-Cp for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:14:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNOJN-00087a-BR for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:14:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNOJN-00087T-4W for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:14:17 -0500 Date: Mon, 16 Feb 2015 17:13:53 +0100 From: "Michael S. Tsirkin" Message-ID: <20150216161353.GD25470@redhat.com> References: <1423999136-17320-1-git-send-email-mst@redhat.com> <1423999136-17320-3-git-send-email-mst@redhat.com> <20150216170316.42057fa7@oc7435384737.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150216170316.42057fa7@oc7435384737.ibm.com> Subject: Re: [Qemu-devel] [PATCH v2 02/17] include: import virtio headers from linux 4.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: Peter Maydell , qemu-devel@nongnu.org, Alexander Graf , Stefan Hajnoczi , Cornelia Huck , "Chen, Tiejun" On Mon, Feb 16, 2015 at 05:03:16PM +0100, Thomas Huth wrote: > On Sun, 15 Feb 2015 12:38:37 +0100 > "Michael S. Tsirkin" wrote: > > > Add files imported from linux-next (what will become linux 4.0) using > > scripts/update-linux-headers.sh > > > > Signed-off-by: Michael S. Tsirkin > > --- > > include/standard-headers/sys/if_ether.h | 1 + > > include/standard-headers/sys/types.h | 2 + > > include/standard-headers/sys/virtio_9p.h | 44 +++++ > > include/standard-headers/sys/virtio_balloon.h | 59 +++++++ > > include/standard-headers/sys/virtio_blk.h | 143 ++++++++++++++++ > > include/standard-headers/sys/virtio_config.h | 64 +++++++ > > include/standard-headers/sys/virtio_console.h | 78 +++++++++ > > include/standard-headers/sys/virtio_ids.h | 43 +++++ > > include/standard-headers/sys/virtio_net.h | 233 ++++++++++++++++++++++++++ > > include/standard-headers/sys/virtio_pci.h | 193 +++++++++++++++++++++ > > include/standard-headers/sys/virtio_ring.h | 171 +++++++++++++++++++ > > include/standard-headers/sys/virtio_rng.h | 8 + > > include/standard-headers/sys/virtio_scsi.h | 164 ++++++++++++++++++ > > include/standard-headers/sys/virtio_types.h | 46 +++++ > > 14 files changed, 1249 insertions(+) > > create mode 100644 include/standard-headers/sys/if_ether.h > > create mode 100644 include/standard-headers/sys/types.h > > create mode 100644 include/standard-headers/sys/virtio_9p.h > > create mode 100644 include/standard-headers/sys/virtio_balloon.h > > create mode 100644 include/standard-headers/sys/virtio_blk.h > > create mode 100644 include/standard-headers/sys/virtio_config.h > > create mode 100644 include/standard-headers/sys/virtio_console.h > > create mode 100644 include/standard-headers/sys/virtio_ids.h > > create mode 100644 include/standard-headers/sys/virtio_net.h > > create mode 100644 include/standard-headers/sys/virtio_pci.h > > create mode 100644 include/standard-headers/sys/virtio_ring.h > > create mode 100644 include/standard-headers/sys/virtio_rng.h > > create mode 100644 include/standard-headers/sys/virtio_scsi.h > > create mode 100644 include/standard-headers/sys/virtio_types.h > > > > diff --git a/include/standard-headers/sys/if_ether.h b/include/standard-headers/sys/if_ether.h > > new file mode 100644 > > index 0000000..91cf735 > > --- /dev/null > > +++ b/include/standard-headers/sys/if_ether.h > > @@ -0,0 +1 @@ > > +#define ETH_ALEN 6 > > diff --git a/include/standard-headers/sys/types.h b/include/standard-headers/sys/types.h > > new file mode 100644 > > index 0000000..7d42ac6 > > --- /dev/null > > +++ b/include/standard-headers/sys/types.h > > @@ -0,0 +1,2 @@ > > +#include > > +#include "qemu/compiler.h" > > diff --git a/include/standard-headers/sys/virtio_9p.h b/include/standard-headers/sys/virtio_9p.h > > new file mode 100644 > > index 0000000..19df0e4 > > --- /dev/null > > +++ b/include/standard-headers/sys/virtio_9p.h > > @@ -0,0 +1,44 @@ > > +#ifndef _LINUX_VIRTIO_9P_H > > +#define _LINUX_VIRTIO_9P_H > > Would it make sense to replace the _LINUX_ in the header guards with > the update-linux-headers.sh script, too (to avoid confusion with the > real Linux headers)? > > Thomas There will be conflicts if you try to pull in both, anyway. So just don't do it :) -- MST