From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42762)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1WO4pB-00041P-LE
	for qemu-devel@nongnu.org; Thu, 13 Mar 2014 08:33:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1WO4p5-00066R-6h
	for qemu-devel@nongnu.org; Thu, 13 Mar 2014 08:33:25 -0400
Received: from mx1.redhat.com ([209.132.183.28]:21314)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1WO4p4-00064l-TM
	for qemu-devel@nongnu.org; Thu, 13 Mar 2014 08:33:19 -0400
Date: Thu, 13 Mar 2014 13:33:13 +0100
From: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20140313123313.GF13611@stefanha-thinkpad.redhat.com>
References: <1394620172-25071-1-git-send-email-stefanha@redhat.com>
	<CAFEAcA818JM4+deFbj1-CLCRjYVk7+yfi_aU=2xurs4sLqD=Jg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <CAFEAcA818JM4+deFbj1-CLCRjYVk7+yfi_aU=2xurs4sLqD=Jg@mail.gmail.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PULL 00/24] Block patches for QEMU 2.0
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, Anthony Liguori <aliguori@amazon.com>

On Wed, Mar 12, 2014 at 03:48:16PM +0000, Peter Maydell wrote:
> On 12 March 2014 10:29, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > The following changes since commit b304bf0021a2dfb24fa91f704a1d976b74=
f56f20:
> >
> >   s390/kvm: Add Maintainers for s390/kvm (2014-03-10 16:43:11 +0000)
> >
> > are available in the git repository at:
> >
> >   git://github.com/stefanha/qemu.git tags/block-pull-request
> >
> > for you to fetch changes up to 11dfe5671f5d75873d9cf89e9c989655f09ccb=
0a:
> >
> >   block/raw-win32: bdrv_parse_filename() for hdev (2014-03-12 11:03:2=
9 +0100)
>=20
> Fails to compile when merged:
>=20
> /home/petmay01/linaro/qemu-for-merges/iothread.c: In function
> =E2=80=98iothread_complete=E2=80=99:
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: passing
> argument 2 of =E2=80=98qemu_thread_create=E2=80=99 from incompatible po=
inter type
> [-Werror]
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: expected =E2=80=98const char *=E2=80=99 but argument is of type =E2=
=80=98void * (*)(void
> *)=E2=80=99
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: passing
> argument 3 of =E2=80=98qemu_thread_create=E2=80=99 from incompatible po=
inter type
> [-Werror]
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: expected =E2=80=98void * (*)(void *)=E2=80=99 but argument is of =
type =E2=80=98struct
> IOThread *=E2=80=99
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: too few
> arguments to function =E2=80=98qemu_thread_create=E2=80=99
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: declared here
> cc1: all warnings being treated as errors
>=20
> I guess it needs updating to handle the thread-naming stuff.

Yep, thanks!  I'll resend it after resolving the thread-naming merge
conflict.

Stefan