[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/2] migration: remove duplicate typedef
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 2/2] migration: remove duplicate typedef |
Date: |
Wed, 14 Jun 2017 12:58:21 +0800 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Tue, 06/13 15:30, Philippe Mathieu-Daudé wrote:
> $ make address@hidden
> 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é <address@hidden>
> ---
> 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 <address@hidden>
Peter: since this affects patchew results, shall we apply this onto master
directly? I can take patch 1 in my tree.
Fam