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" <m...@redhat.com> wrote:
>
> > Switch to virtio_ring.h from standard headers.
> >
> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
> > ---
> > 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
