summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaniel P. Berrange2016-04-27 12:05:14 +0200
committerAmit Shah2016-05-26 08:02:07 +0200
commit2594f56d4c7ef621da5d0c21921f8fda32025623 (patch)
tree2c687eecbd4e6e8186f90a92206f40bb1c005bb2 /include
parentmigration: move definition of struct QEMUFile back into qemu-file.c (diff)
downloadqemu-2594f56d4c7ef621da5d0c21921f8fda32025623.tar.gz
qemu-2594f56d4c7ef621da5d0c21921f8fda32025623.tar.xz
qemu-2594f56d4c7ef621da5d0c21921f8fda32025623.zip
migration: don't use an array for storing migrate parameters
The MigrateState struct uses an array for storing migration parameters. This presumes that all future parameters will be integers too, which is not going to be the case. There is no functional reason why an array is used, if anything it makes the code less clear. The QAPI schema already defines a struct - MigrationParameters - capable of storing all the individual parameters, so just use that instead of an array. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1461751518-12128-25-git-send-email-berrange@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/migration/migration.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h
index d24c6ef418..74105a11a1 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -135,9 +135,12 @@ struct MigrationState
QemuThread thread;
QEMUBH *cleanup_bh;
QEMUFile *to_dst_file;
- int parameters[MIGRATION_PARAMETER__MAX];
+
+ /* New style params from 'migrate-set-parameters' */
+ MigrationParameters parameters;
int state;
+ /* Old style params from 'migrate' command */
MigrationParams params;
/* State related to return path */