From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO67k-0001Ge-1z for qemu-devel@nongnu.org; Wed, 18 Feb 2015 10:01:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO67g-0001CQ-T5 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 10:01:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO67g-0001CM-L4 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 10:01:08 -0500 Date: Wed, 18 Feb 2015 15:59:35 +0100 From: "Michael S. Tsirkin" Message-ID: <20150218145935.GA3965@redhat.com> References: <1424122283-12521-1-git-send-email-mst@redhat.com> <1424122283-12521-4-git-send-email-mst@redhat.com> <20150217134426.68b8db3e@oc7435384737.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150217134426.68b8db3e@oc7435384737.ibm.com> Subject: Re: [Qemu-devel] [PATCH v3 03/17] virtio: use standard virtio_ring.h 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 Tue, Feb 17, 2015 at 01:44:26PM +0100, Thomas Huth wrote: > On Mon, 16 Feb 2015 22:35:40 +0100 > "Michael S. Tsirkin" wrote: > > > Switch to virtio_ring.h from standard headers. > > > > Signed-off-by: Michael S. Tsirkin > > --- > > include/hw/virtio/dataplane/vring.h | 2 +- > > include/hw/virtio/virtio_ring.h | 167 ------------------------------------ > > hw/net/vhost_net.c | 2 +- > > 3 files changed, 2 insertions(+), 169 deletions(-) > > delete mode 100644 include/hw/virtio/virtio_ring.h > > > > diff --git a/include/hw/virtio/dataplane/vring.h b/include/hw/virtio/dataplane/vring.h > > index d3e086a..836d26a 100644 > > --- a/include/hw/virtio/dataplane/vring.h > > +++ b/include/hw/virtio/dataplane/vring.h > > @@ -18,7 +18,7 @@ > > #define VRING_H > > > > #include "qemu-common.h" > > -#include "hw/virtio/virtio_ring.h" > > +#include "standard-headers/linux/virtio_ring.h" > > #include "hw/virtio/virtio.h" > > > > typedef struct { > > diff --git a/include/hw/virtio/virtio_ring.h b/include/hw/virtio/virtio_ring.h > > deleted file mode 100644 > > index 0b42e6e..0000000 > > --- a/include/hw/virtio/virtio_ring.h > > +++ /dev/null > > @@ -1,167 +0,0 @@ > > -#ifndef _LINUX_VIRTIO_RING_H > > -#define _LINUX_VIRTIO_RING_H > > -/* > > - * This file is copied from /usr/include/linux while converting __uNN types > > - * to uXX_t, __inline__ to inline, and tab to spaces. > > - * */ > > Hmmm, in the old header, the "__inline__" was replaced with > "inline" ... in the new header from patch 2, there's now "__inline__" > again. Was there a good reason for this replacement? If yes, your > update-linux-headers.sh patch should maybe replace the "__inline__" > into "inline", too? > > Apart from that, the patch looks good to me. > > Thomas Probably a good idea, will do, though I wonder why does qemu use always_inline so aggressively. OK to do as patch on top? This series is too big already. -- MST