[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/16] vmstate: check subsection_found is enough
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 04/16] vmstate: check subsection_found is enough |
Date: |
Tue, 14 May 2019 19:34:42 +0100 |
From: Wei Yang <address@hidden>
subsection_found is true implies vmdesc is not NULL.
This patch remove the additional check on vmdesc and rename
subsection_found to vmdesc_has_subsections to make it more self-explain.
Signed-off-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Acked-by: Stefano Garzarella <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/vmstate.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/vmstate.c b/migration/vmstate.c
index e2bbb7b5f7..1305d1a528 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -496,7 +496,7 @@ static int vmstate_subsection_save(QEMUFile *f, const
VMStateDescription *vmsd,
void *opaque, QJSON *vmdesc)
{
const VMStateDescription **sub = vmsd->subsections;
- bool subsection_found = false;
+ bool vmdesc_has_subsections = false;
int ret = 0;
trace_vmstate_subsection_save_top(vmsd->name);
@@ -508,9 +508,9 @@ static int vmstate_subsection_save(QEMUFile *f, const
VMStateDescription *vmsd,
trace_vmstate_subsection_save_loop(vmsd->name, vmsdsub->name);
if (vmdesc) {
/* Only create subsection array when we have any */
- if (!subsection_found) {
+ if (!vmdesc_has_subsections) {
json_start_array(vmdesc, "subsections");
- subsection_found = true;
+ vmdesc_has_subsections = true;
}
json_start_object(vmdesc, NULL);
@@ -533,7 +533,7 @@ static int vmstate_subsection_save(QEMUFile *f, const
VMStateDescription *vmsd,
sub++;
}
- if (vmdesc && subsection_found) {
+ if (vmdesc_has_subsections) {
json_end_array(vmdesc);
}
--
2.21.0
- [Qemu-devel] [PULL 00/16] migration queue, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 01/16] migration: comment VMSTATE_UNUSED*() properly, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 02/16] migration: not necessary to check ops again, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 03/16] migration: remove not used field xfer_limit, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 04/16] vmstate: check subsection_found is enough,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 05/16] migration: savevm: fix error code with migration blockers, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 06/16] migration/colo.c: Remove redundant input parameter, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 07/16] migration/colo.h: Remove obsolete codes, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 08/16] qemu-option.hx: Update missed parameter for colo-compare, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 09/16] migration/ram.c: start of migration_bitmap_sync_range is always 0, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 10/16] migration: update comments of migration bitmap, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 11/16] migration/savevm: remove duplicate check of migration_is_blocked, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 12/16] migration/savevm: load_header before load_setup, Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 13/16] migration/savevm: wrap into qemu_loadvm_state_header(), Dr. David Alan Gilbert (git), 2019/05/14
- [Qemu-devel] [PULL 14/16] migration: Fix use-after-free during process exit, Dr. David Alan Gilbert (git), 2019/05/14