diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/migration.h | 1 | ||||
| -rw-r--r-- | include/migration/qjson.h (renamed from include/qjson.h) | 2 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index ac2c12c2a5..9e36a97fc5 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -210,6 +210,7 @@ int migrate_fd_close(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); MigrationState *migrate_init(const MigrationParams *params); +bool migration_is_blocked(Error **errp); bool migration_in_setup(MigrationState *); bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); diff --git a/include/qjson.h b/include/migration/qjson.h index 7c54fdf0ac..2978b5f371 100644 --- a/include/qjson.h +++ b/include/migration/qjson.h @@ -13,10 +13,10 @@ #ifndef QEMU_QJSON_H #define QEMU_QJSON_H -#define TYPE_QJSON "QJSON" typedef struct QJSON QJSON; QJSON *qjson_new(void); +void qjson_destroy(QJSON *json); void json_prop_str(QJSON *json, const char *name, const char *str); void json_prop_int(QJSON *json, const char *name, int64_t val); void json_end_array(QJSON *json); diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 84ee355ceb..30ecc441de 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -29,7 +29,7 @@ #ifndef CONFIG_USER_ONLY #include <migration/qemu-file.h> #endif -#include <qjson.h> +#include "migration/qjson.h" typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); |