From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L6rab-0002zE-OR
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 14:04:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L6raZ-0002z2-3c
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 14:04:17 -0500
Received: from [199.232.76.173] (port=49356 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L6raZ-0002yz-1B
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 14:04:15 -0500
Received: from mx2.redhat.com ([66.187.237.31]:52977)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <aarcange@redhat.com>) id 1L6raY-0001KL-B3
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 14:04:14 -0500
Date: Sun, 30 Nov 2008 20:04:09 +0100
From: Andrea Arcangeli <aarcange@redhat.com>
Message-ID: <20081130190408.GE32172@random.random>
References: <20081127123538.GC10348@random.random>
	<f43fc5580811271114u7ecc3277kc7518fb7dbf9b4c0@mail.gmail.com>
	<20081128015602.GA31011@random.random>
	<f43fc5580811280959k3410e62eq7a2a46417b438b64@mail.gmail.com>
	<20081128185001.GD31011@random.random>
	<20081130174133.GC32172@random.random>
	<f43fc5580811301036r19c15898me62cc07b16da71ba@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <f43fc5580811301036r19c15898me62cc07b16da71ba@mail.gmail.com>
Subject: [Qemu-devel] Re: [RFC 1/1] pci-dma-api-v2
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel@nongnu.org

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!