summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2016-02-04 22:50:30 +0000
committerAmit Shah <amit.shah@redhat.com>2016-02-26 15:05:24 +0530
commitbdf46d6478df86d5810048459582dc8f5a15b064 (patch)
tree725f9a2b7776cc5d4b52fda969b7645742a35f64
parent0c6940d086f39bbf725d96104abe46da87429cb6 (diff)
downloadfocaccia-qemu-bdf46d6478df86d5810048459582dc8f5a15b064.tar.gz
focaccia-qemu-bdf46d6478df86d5810048459582dc8f5a15b064.zip
migration: reorder code to make it symmetric
In qemu_savevm_state_complete_precopy(), it iterates on each device to add
a json object and transfer related status to destination, while the order
of the last two steps could be refined.

Current order:

    json_start_object()
    	save_section_header()
    	vmstate_save()
    json_end_object()
    	save_section_footer()

After the change:

    json_start_object()
    	save_section_header()
    	vmstate_save()
    	save_section_footer()
    json_end_object()

This patch reorder the code to to make it symmetric. No functional change.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Message-Id: <1454626230-16334-1-git-send-email-richard.weiyang@gmail.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
-rw-r--r--migration/savevm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/migration/savevm.c b/migration/savevm.c
index 94f2894243..02e8487441 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1088,12 +1088,11 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only)
         json_prop_int(vmdesc, "instance_id", se->instance_id);
 
         save_section_header(f, se, QEMU_VM_SECTION_FULL);
-
         vmstate_save(f, se, vmdesc);
-
-        json_end_object(vmdesc);
         trace_savevm_section_end(se->idstr, se->section_id, 0);
         save_section_footer(f, se);
+
+        json_end_object(vmdesc);
     }
 
     if (!in_postcopy) {