[Qemu-devel] Re: [RFC 1/1] pci-dma-api-v2

[Andrea Arcangeli <aarcange@redhat.com>]

On Sun, Nov 30, 2008 at 08:36:56PM +0200, Blue Swirl wrote:
> The patch does not apply as is:
> >  --- hw/ide.c    (revision 5818)
> >  +++ hw/ide.c    (working copy)
> >  diff --git a/qemu/hw/pci_dma.c b/qemu/hw/pci_dma.c
> >  new file mode 100644
> >  index 0000000..48762a8
> >  --- /dev/null
> >  +++ b/qemu/hw/pci_dma.c
> >  diff --git a/qemu/hw/pci_dma.h b/qemu/hw/pci_dma.h
> >  new file mode 100644
> >  index 0000000..5cc8413
> >  --- /dev/null
> >  +++ b/qemu/hw/pci_dma.h

Yes sorry it's because I generate the patches with 'git diff master'
and I cut and pasted them in... hand editing the patch to remove
'b/qemu/' will fix it (to apply later with patch -p0 of course, not
standard but the default with svn).

> Even as I fixed the patch, it still does not compile, for example:
> /src/qemu/block.c:1335: warning: 'struct iovec' declared inside parameter list
> /src/qemu/block.c:1336: error: conflicting types for 'bdrv_aio_writev'
> /src/qemu/block.h:106: error: previous declaration of 'bdrv_aio_writev' was here
> /src/qemu/block.c:1425: error: invalid use of undefined type 'struct iovec'

Weird... I don't get that error, is that an old compiler? Does it go
away if you move the #include <sys/uio.h> from pci_dma.h to block.h?

Thanks!