* [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough
@ 2019-04-03 1:10 Wei Yang
2019-04-03 7:52 ` Stefano Garzarella
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Wei Yang @ 2019-04-03 1:10 UTC (permalink / raw)
To: qemu-devel; +Cc: quintela, dgilbert, Wei Yang
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 <richardw.yang@linux.intel.com>
---
v2:
* rename it to vmdesc_has_subsections
---
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.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough
2019-04-03 1:10 [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough Wei Yang
@ 2019-04-03 7:52 ` Stefano Garzarella
2019-04-03 10:42 ` Dr. David Alan Gilbert
2019-05-14 13:40 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Garzarella @ 2019-04-03 7:52 UTC (permalink / raw)
To: Wei Yang; +Cc: qemu-devel, dgilbert, quintela
On Wed, Apr 03, 2019 at 09:10:16AM +0800, Wei Yang wrote:
> 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 <richardw.yang@linux.intel.com>
>
> ---
> v2:
> * rename it to vmdesc_has_subsections
> ---
> migration/vmstate.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough
2019-04-03 1:10 [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough Wei Yang
2019-04-03 7:52 ` Stefano Garzarella
@ 2019-04-03 10:42 ` Dr. David Alan Gilbert
2019-05-14 13:40 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2019-04-03 10:42 UTC (permalink / raw)
To: Wei Yang; +Cc: qemu-devel, quintela
* Wei Yang (richardw.yang@linux.intel.com) wrote:
> 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 <richardw.yang@linux.intel.com>
Thanks,
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> ---
> v2:
> * rename it to vmdesc_has_subsections
> ---
> 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.19.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough
2019-04-03 1:10 [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough Wei Yang
2019-04-03 7:52 ` Stefano Garzarella
2019-04-03 10:42 ` Dr. David Alan Gilbert
@ 2019-05-14 13:40 ` Dr. David Alan Gilbert
2 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2019-05-14 13:40 UTC (permalink / raw)
To: Wei Yang; +Cc: qemu-devel, quintela
* Wei Yang (richardw.yang@linux.intel.com) wrote:
> 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 <richardw.yang@linux.intel.com>
Queued.
> ---
> v2:
> * rename it to vmdesc_has_subsections
> ---
> 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.19.1
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-14 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-03 1:10 [Qemu-devel] [PATCH v2] vmstate: check subsection_found is enough Wei Yang
2019-04-03 7:52 ` Stefano Garzarella
2019-04-03 10:42 ` Dr. David Alan Gilbert
2019-05-14 13:40 ` Dr. David Alan Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).