[Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler

[Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler

[Paolo Bonzini]

As the simplest fix to un-confuse patchew, inline the type
in struct VMStateDescription.  As there are no users of
LoadStateHandler anymore in e.g. function declarations,
there isn't much advantage in defining it as a type.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/migration/vmstate.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f3f3c2a..82d41fa 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -29,7 +29,6 @@
 
 #include "migration/qjson.h"
 
-typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
 typedef struct VMStateInfo VMStateInfo;
 typedef struct VMStateDescription VMStateDescription;
 typedef struct VMStateField VMStateField;
@@ -176,7 +175,7 @@ struct VMStateDescription {
     int minimum_version_id;
     int minimum_version_id_old;
     MigrationPriority priority;
-    LoadStateHandler *load_state_old;
+    int (*load_state_old)(QEMUFile *f, void *opaque, int version_id);
     int (*pre_load)(void *opaque);
     int (*post_load)(void *opaque, int version_id);
     void (*pre_save)(void *opaque);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler

[Peter Maydell]

On 15 June 2017 at 10:49, Paolo Bonzini <pbonzini@redhat.com> wrote:
> As the simplest fix to un-confuse patchew, inline the type
> in struct VMStateDescription.  As there are no users of
> LoadStateHandler anymore in e.g. function declarations,
> there isn't much advantage in defining it as a type.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

I'm currently processing Juan's pullrequest which includes
a fix for this (it moves the typedefs into typedefs.h.)

thanks
-- PMM