vmstate: check subsection_found is enough
PATCH v2 1/1 vmstate: check subsection_found is enough
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.
---
v2:
* rename it to vmdesc_has_subsections
--- migration/vmstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
migration/vmstate.c +4 -4
@@ -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); }
Signature · 1 line
2.19.1
Quoted 5 lines · Wei Yang
subsection_foundis true implies vmdesc is not NULL.This patch remove the additional check on vmdesc and rename
subsection_foundtovmdesc_has_subsectionsto make it more self-explain.
Quoted 9 lines
Signed-off-by Wei Yang <[email protected]>---
v2:
* rename it tovmdesc_has_subsections--- migration/vmstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Quoted 6 lines · * Wei Yang ([email protected]) wrote:
subsection_foundis true implies vmdesc is not NULL.This patch remove the additional check on vmdesc and rename
subsection_foundtovmdesc_has_subsectionsto make it more self-explain.Signed-off-by Wei Yang <[email protected]>
Thanks,
Quoted 45 lines
---
v2:
* rename it tovmdesc_has_subsections--- migration/vmstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)migration/vmstate.c +4
-4@@ -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); }Signature · 1 line
2.19.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 6 lines · * Wei Yang ([email protected]) wrote:
subsection_foundis true implies vmdesc is not NULL.This patch remove the additional check on vmdesc and rename
subsection_foundtovmdesc_has_subsectionsto make it more self-explain.Signed-off-by Wei Yang <[email protected]>
Queued.
Quoted 45 lines
---
v2:
* rename it tovmdesc_has_subsections--- migration/vmstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)migration/vmstate.c +4
-4@@ -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); }Signature · 1 line
2.19.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK