Re: [Qemu-devel] [RFC PATCH v2 04/12] Move virtio_mmio.h to fix update-linux-headers.sh

[Sam Bobroff]

On Fri, Feb 24, 2017 at 06:47:03PM +0200, Michael S. Tsirkin wrote:
> On Thu, Feb 23, 2017 at 04:59:57PM +1100, Sam Bobroff wrote:
> > Currently, running update-linux-headers.sh will produce a patch that
> > deletes virtio_mmio.h, which is still needed. This happens because
> > virtio_mmio.h is in the directory used to store headers from the linux
> > kernel that are copied by the kernel's "make headers_install" target
> > (used by the update script) but it is not one of the files in that
> > set.
> > 
> > Fix this by moving that file into a new directory.
> > 
> > In the future if that file is added to the "headers_install" target
> > then this change should be reverted.
> > 
> > Signed-off-by: Sam Bobroff <address@hidden>
> 
> This is a temporary condition - I'm adding a patch exporting
> this header for next linux. So I don't think we should merge this.

Great :-)

I'll drop this patch from the next version.

Cheers,
Sam.

> > ---
> > v2:
> > * FWIW, here's one way of fixing it.
> > 
> >  hw/virtio/virtio-mmio.c                                          | 2 +-
> >  include/{standard-headers => kernel-headers}/linux/virtio_mmio.h | 0
> >  2 files changed, 1 insertion(+), 1 deletion(-)
> >  rename include/{standard-headers => kernel-headers}/linux/virtio_mmio.h 
> > (100%)
> > 
> > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
> > index 5807aa87fe..cc6afa9da1 100644
> > --- a/hw/virtio/virtio-mmio.c
> > +++ b/hw/virtio/virtio-mmio.c
> > @@ -20,7 +20,7 @@
> >   */
> >  
> >  #include "qemu/osdep.h"
> > -#include "standard-headers/linux/virtio_mmio.h"
> > +#include "kernel-headers/linux/virtio_mmio.h"
> >  #include "hw/sysbus.h"
> >  #include "hw/virtio/virtio.h"
> >  #include "qemu/host-utils.h"
> > diff --git a/include/standard-headers/linux/virtio_mmio.h 
> > b/include/kernel-headers/linux/virtio_mmio.h
> > similarity index 100%
> > rename from include/standard-headers/linux/virtio_mmio.h
> > rename to include/kernel-headers/linux/virtio_mmio.h
> > -- 
> > 2.11.0
> >