On 25 March 2016 at 07:42, Jason Wang <jasow...@redhat.com> wrote: > The following changes since commit b68a80139e37e806f004237e55311ebc42151434: > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into > staging (2016-03-24 16:24:02 +0000) > > are available in the git repository at: > > https://github.com/jasowang/qemu.git tags/net-pull-request > > for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f: > > Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 > 10:39:43 +0800) > > ---------------------------------------------------------------- > > - mirror/redirector which could mirror or redirct the traffic between > netdev and chardev > - fix e1000 interrupt strom and remove previous hack
Hi. I'm afraid this fails to compile: /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function ‘filter_mirror_setup’: /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9: error: implicit declaration of function ‘error_setg’ [-Werror=implicit-function-declaration] error_setg(errp, "filter filter mirror needs 'outdev' " ^ /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9: error: nested extern declaration of ‘error_setg’ [-Werror=nested-externs] /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9: error: implicit declaration of function ‘error_set’ [-Werror=implicit-function-declaration] error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, ^ /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9: error: nested extern declaration of ‘error_set’ [-Werror=nested-externs] /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25: error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this function) error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, ^ /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25: note: each undeclared identifier is reported only once for each function it appears in /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function ‘filter_redirector_setup’: /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:281:29: error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this function) error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, ^ cc1: all warnings being treated as errors I think your commit has unfortunately clashed with the pull from Paolo that I've just applied that makes changes to our include files. thanks -- PMM