diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-06-14 10:34:34 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-14 11:08:55 +0200 |
| commit | 68a4a2fda1e698414fc40d264c387dbce3391915 (patch) | |
| tree | b2fca2f5b5b6578c420c9199c4b77065bbd0a724 /include | |
| parent | 3f0602927b120a480b35dcf58cf6f95435b3ae91 (diff) | |
| download | qemu-68a4a2fda1e698414fc40d264c387dbce3391915.zip qemu-68a4a2fda1e698414fc40d264c387dbce3391915.tar.gz qemu-68a4a2fda1e698414fc40d264c387dbce3391915.tar.bz2 | |
migration: Fix compilation with older compilers
That typedefs are needed on both files. New compilers (F25 where I
work) don't complain about repeating a typedef. But older ones
complain.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/register.h | 3 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 1 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/migration/register.h b/include/migration/register.h index 717c617..d9498d9 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -14,9 +14,6 @@ #ifndef MIGRATION_REGISTER_H #define MIGRATION_REGISTER_H -typedef void SaveStateHandler(QEMUFile *f, void *opaque); -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); - typedef struct SaveVMHandlers { /* This runs inside the iothread lock. */ SaveStateHandler *save_state; diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f3f3c2a..e85fbd8 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; diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 51958bf..f745d5f 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -96,5 +96,7 @@ typedef struct uWireSlave uWireSlave; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; typedef struct node_info NodeInfo; +typedef void SaveStateHandler(QEMUFile *f, void *opaque); +typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); #endif /* QEMU_TYPEDEFS_H */ |