| Message ID | 20170613183025.5145-3-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
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
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;
$ 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(-)