| Message ID | 20190709140924.13291-2-richardw.yang@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration/savevm: move non SaveStateEntry condition check out of iteration | expand |
* Wei Yang (richardw.yang@linux.intel.com) wrote: > It would be proper to flush file even for iterable_only case. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> OK, I don't think this is actually necessary; but it's safe. We only really need the flush at the end of the file, and in the non-iterable-only case it's not the end of the file. Since it makes your next change simpler, Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/savevm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index c0e557b4c2..becedcc1c6 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1292,7 +1292,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, > } > > if (iterable_only) { > - return 0; > + goto flush; > } > > vmdesc = qjson_new(); > @@ -1353,6 +1353,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, > } > qjson_destroy(vmdesc); > > +flush: > qemu_fflush(f); > return 0; > } > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On Fri, Jul 19, 2019 at 05:47:59PM +0100, Dr. David Alan Gilbert wrote: >* Wei Yang (richardw.yang@linux.intel.com) wrote: >> It would be proper to flush file even for iterable_only case. >> >> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > >OK, I don't think this is actually necessary; but it's safe. >We only really need the flush at the end of the file, and in the >non-iterable-only case it's not the end of the file. > >Since it makes your next change simpler, Yep, you are so kind. > >Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > >> --- >> migration/savevm.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/migration/savevm.c b/migration/savevm.c >> index c0e557b4c2..becedcc1c6 100644 >> --- a/migration/savevm.c >> +++ b/migration/savevm.c >> @@ -1292,7 +1292,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, >> } >> >> if (iterable_only) { >> - return 0; >> + goto flush; >> } >> >> vmdesc = qjson_new(); >> @@ -1353,6 +1353,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, >> } >> qjson_destroy(vmdesc); >> >> +flush: >> qemu_fflush(f); >> return 0; >> } >> -- >> 2.17.1 >> >-- >Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/savevm.c b/migration/savevm.c index c0e557b4c2..becedcc1c6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1292,7 +1292,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, } if (iterable_only) { - return 0; + goto flush; } vmdesc = qjson_new(); @@ -1353,6 +1353,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, } qjson_destroy(vmdesc); +flush: qemu_fflush(f); return 0; }
It would be proper to flush file even for iterable_only case. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)