Re: [Qemu-devel] [PULL 00/24] Block patches for QEMU 2.0

[Stefan Hajnoczi]

On Wed, Mar 12, 2014 at 03:48:16PM +0000, Peter Maydell wrote:
> On 12 March 2014 10:29, Stefan Hajnoczi <address@hidden> wrote:
> >
> > The following changes since commit b304bf0021a2dfb24fa91f704a1d976b74f56f20:
> >
> >   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 11dfe5671f5d75873d9cf89e9c989655f09ccb0a:
> >
> >   block/raw-win32: bdrv_parse_filename() for hdev (2014-03-12 11:03:29 
> > +0100)
> 
> Fails to compile when merged:
> 
> /home/petmay01/linaro/qemu-for-merges/iothread.c: In function
> ‘iothread_complete’:
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: passing
> argument 2 of ‘qemu_thread_create’ from incompatible pointer type
> [-Werror]
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: expected ‘const char *’ but argument is of type ‘void * (*)(void
> *)’
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: passing
> argument 3 of ‘qemu_thread_create’ from incompatible pointer type
> [-Werror]
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: expected ‘void * (*)(void *)’ but argument is of type ‘struct
> IOThread *’
> /home/petmay01/linaro/qemu-for-merges/iothread.c:87:24: error: too few
> arguments to function ‘qemu_thread_create’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:55:6:
> note: declared here
> cc1: all warnings being treated as errors
> 
> 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