We need to be able to access savevm handlers from code that lives outside of savevm.c. Extract its struct definitions and declaration into a separate header file.
Signed-off-by: Alexander Graf <ag...@suse.de> --- include/qemu/savevm.h | 28 ++++++++++++++++++++++++++++ savevm.c | 24 ++---------------------- 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 include/qemu/savevm.h diff --git a/include/qemu/savevm.h b/include/qemu/savevm.h new file mode 100644 index 0000000..5dae243 --- /dev/null +++ b/include/qemu/savevm.h @@ -0,0 +1,28 @@ +#ifndef QEMU_SAVEVM_H +#define QEMU_SAVEVM_H + +typedef struct CompatEntry { + char idstr[256]; + int instance_id; +} CompatEntry; + +typedef struct SaveStateEntry { + QTAILQ_ENTRY(SaveStateEntry) entry; + char idstr[256]; + int instance_id; + int alias_id; + int version_id; + int section_id; + SaveVMHandlers *ops; + const VMStateDescription *vmsd; + void *opaque; + CompatEntry *compat; + int no_migrate; + int is_ram; +} SaveStateEntry; + +typedef QTAILQ_HEAD(EHCIQueueHead, EHCIQueue) EHCIQueueHead; +typedef QTAILQ_HEAD(savevm_handlers, SaveStateEntry) SaveStateEntryHead; +extern SaveStateEntryHead savevm_handlers; + +#endif /* QEMU_SAVEVM_H */ diff --git a/savevm.c b/savevm.c index 2f631d4..eea45e1 100644 --- a/savevm.c +++ b/savevm.c @@ -1457,29 +1457,9 @@ const VMStateInfo vmstate_info_bitmap = { .put = put_bitmap, }; -typedef struct CompatEntry { - char idstr[256]; - int instance_id; -} CompatEntry; - -typedef struct SaveStateEntry { - QTAILQ_ENTRY(SaveStateEntry) entry; - char idstr[256]; - int instance_id; - int alias_id; - int version_id; - int section_id; - SaveVMHandlers *ops; - const VMStateDescription *vmsd; - void *opaque; - CompatEntry *compat; - int no_migrate; - int is_ram; -} SaveStateEntry; - +#include "qemu/savevm.h" -static QTAILQ_HEAD(savevm_handlers, SaveStateEntry) savevm_handlers = - QTAILQ_HEAD_INITIALIZER(savevm_handlers); +SaveStateEntryHead savevm_handlers = QTAILQ_HEAD_INITIALIZER(savevm_handlers); static int global_section_id; static int calculate_new_instance_id(const char *idstr) -- 1.7.12.4