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

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

[Philippe Mathieu-Daudé]

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

[Qemu-devel] [PATCH 1/2] docker: Add flex and bison to centos6 image

[Philippe Mathieu-Daudé]

From: Fam Zheng <famz@redhat.com>

Currently there are warnings about flex and bison being missing when
building in the centos6 image:

    make[1]: flex: Command not found
             BISON dtc-parser.tab.c
    make[1]: bison: Command not found

Add them.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/dockerfiles/centos6.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 34e0d3b91e..17a4d24d54 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -1,7 +1,7 @@
 FROM centos:6
 RUN yum install -y epel-release
 ENV PACKAGES libfdt-devel ccache \
-    tar git make gcc g++ \
+    tar git make gcc g++ flex bison \
     zlib-devel glib2-devel SDL-devel pixman-devel \
     epel-release
 RUN yum install -y $PACKAGES
-- 
2.11.0

[Qemu-devel] [PATCH 2/2] migration: remove duplicate typedef

[Philippe Mathieu-Daudé]

    $ make docker-run-test-quick@centos6
    In file included from hw/net/vmxnet3.c:30:
    include/migration/register.h:18: error: redefinition of typedef ‘LoadStateHandler’
    include/migration/vmstate.h:32: note: previous declaration of ‘LoadStateHandler’ was here
    make: *** [hw/net/vmxnet3.o] Error 1
    tests/docker/Makefile.include:118: recipe for target 'docker-run' failed

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/migration/vmstate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f3f3c2af4d..342027def8 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -28,8 +28,8 @@
 #define QEMU_VMSTATE_H
 
 #include "migration/qjson.h"
+#include "migration/register.h"
 
-typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
 typedef struct VMStateInfo VMStateInfo;
 typedef struct VMStateDescription VMStateDescription;
 typedef struct VMStateField VMStateField;
-- 
2.11.0

Re: [Qemu-devel] [PATCH 2/2] migration: remove duplicate typedef

[Fam Zheng]

On Tue, 06/13 15:30, Philippe Mathieu-Daudé wrote:
>     $ make docker-run-test-quick@centos6
>     In file included from hw/net/vmxnet3.c:30:
>     include/migration/register.h:18: error: redefinition of typedef ‘LoadStateHandler’
>     include/migration/vmstate.h:32: note: previous declaration of ‘LoadStateHandler’ was here
>     make: *** [hw/net/vmxnet3.o] Error 1
>     tests/docker/Makefile.include:118: recipe for target 'docker-run' failed
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  include/migration/vmstate.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
> index f3f3c2af4d..342027def8 100644
> --- a/include/migration/vmstate.h
> +++ b/include/migration/vmstate.h
> @@ -28,8 +28,8 @@
>  #define QEMU_VMSTATE_H
>  
>  #include "migration/qjson.h"
> +#include "migration/register.h"
>  
> -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
>  typedef struct VMStateInfo VMStateInfo;
>  typedef struct VMStateDescription VMStateDescription;
>  typedef struct VMStateField VMStateField;
> -- 
> 2.11.0
> 

Reviewed-by: Fam Zheng <famz@redhat.com>

Peter: since this affects patchew results, shall we apply this onto master
directly? I can take patch 1 in my tree.

Fam