Fix upstream error: redefinition of typedef 'LoadStateHandler'

[Qemu-devel] [PATCH 0/2] Fix upstream error: redefinition of typedef 'LoadStateHandler'

Philippe Mathieu-Daudé posted 2 patches 8 years, 4 months ago

Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170613183025.5145-1-f4bug@amsat.org

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

include/migration/vmstate.h             | 2 +-
tests/docker/dockerfiles/centos6.docker | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH 0/2] Fix upstream error: redefinition of typedef 'LoadStateHandler'

Posted by Philippe Mathieu-Daudé 8 years, 4 months ago

Also included Fam's patch for bison/flex, not required but still silent few warnings.

patchew output:

    === OUTPUT BEGIN ===
    In file included from /tmp/qemu-test/src/hw/net/vmxnet3.c:30:
    /tmp/qemu-test/src/include/migration/register.h:18: error: redefinition of typedef ‘LoadStateHandler’
    /tmp/qemu-test/src/include/migration/vmstate.h:32: note: previous declaration of ‘LoadStateHandler’ was here
    make: *** [hw/net/vmxnet3.o] Error 1
    make: *** Waiting for unfinished jobs....
    tests/docker/Makefile.include:118: recipe for target 'docker-run' failed
    make[1]: *** [docker-run] Error 2
    make[1]: Leaving directory '/var/tmp/patchew-tester-tmp-x6sxqrj2/src'
    tests/docker/Makefile.include:149: recipe for target 'docker-run-test-quick@centos6' failed
    make: *** [docker-run-test-quick@centos6] Error 2
    === OUTPUT END ===

Fam Zheng (1):
  docker: Add flex and bison to centos6 image

Philippe Mathieu-Daudé (1):
  migration: remove duplicate typedef

 include/migration/vmstate.h             | 2 +-
 tests/docker/dockerfiles/centos6.docker | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.11.0