From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 22 Feb 2013 16:36:26 +0000 (+0100)
Subject: migration: reorder SaveVMHandlers members
X-Git-Tag: v1.5.0-rc0~484^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c8de19d93444536d3291e6ab83e2bcf61dd2d0c;p=thirdparty%2Fqemu.git

migration: reorder SaveVMHandlers members

This groups together the callbacks that later will have similar
locking rules.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 94a409b708f..fdf4e651adf 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -34,13 +34,15 @@ typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
 typedef struct SaveVMHandlers {
     void (*set_params)(const MigrationParams *params, void * opaque);
     SaveStateHandler *save_state;
+
     int (*save_live_setup)(QEMUFile *f, void *opaque);
-    int (*save_live_iterate)(QEMUFile *f, void *opaque);
+    void (*cancel)(void *opaque);
     int (*save_live_complete)(QEMUFile *f, void *opaque);
+    bool (*is_active)(void *opaque);
+    int (*save_live_iterate)(QEMUFile *f, void *opaque);
     uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size);
-    void (*cancel)(void *opaque);
+
     LoadStateHandler *load_state;
-    bool (*is_active)(void *opaque);
 } SaveVMHandlers;
 
 int register_savevm(DeviceState *dev,