On Mon, 7 Jan 2019 at 22:35, Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> The following changes since commit 9b2e891ec5ccdb4a7d583b77988848282606fdea:
>
> Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into
> staging (2018-12-22 11:25:31 +0000)
>
> are available in the Git repository at:
>
> git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to a486bd29567a23a454e248aed1d8c28b90a6ea3e:
>
> avoid TABs in files that only contain a few (2019-01-04 20:59:49 +0100)
>
> ----------------------------------------------------------------
> * HAX support for Linux hosts (Alejandro)
> * esp bugfixes (Guenter)
> * Windows build cleanup (Marc-André)
> * checkpatch logic improvements (Paolo)
> * coalesced range bugfix (Paolo)
> * switch testsuite to TAP (Paolo, with Peter's fix to hexloader-test)
> * QTAILQ rewrite (Paolo)
> * block/iscsi.c cancellation fixes (Stefan)
> * improve selection of the default accelerator (Thomas)
>
Hi. I fixed up a couple of textual conflicts but there
seems to be a semantic conflict with the TCG pull:
/var/tmp/qemu-test.PYf8dT/tcg/tcg.c:2322:65: error: too many arguments
provided to function-like macro i
nvocation
TCGOp *op_prev = QTAILQ_PREV(op, TCGOpHead, link);
^
/var/tmp/qemu-test.PYf8dT/include/qemu/queue.h:457:9: note: macro
'QTAILQ_PREV' defined here
#define QTAILQ_PREV(elm, field) \
^
/var/tmp/qemu-test.PYf8dT/tcg/tcg.c:2322:38: error: use of undeclared
identifier 'QTAILQ_PREV'
TCGOp *op_prev = QTAILQ_PREV(op, TCGOpHead, link);
^
2 errors generated.
Can you fix up and resend, please?
thanks
-- PMM
