| Message ID | 20190710050814.31344-3-richardw.yang@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration/postcopy: cleanup function postcopy_chunk_hostpages_pass | expand |
* Wei Yang (richardw.yang@linux.intel.com) wrote: > This means it is not necessary to spare an extra variable to hold this > condition. Use host_offset directly is fine. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index c4dc36e525..b0ca0059c4 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2873,7 +2873,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, > } > > while (run_start < pages) { > - bool do_fixup = false; > unsigned long fixup_start_addr; > unsigned long host_offset; > > @@ -2883,7 +2882,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, > */ > host_offset = run_start % host_ratio; > if (host_offset) { > - do_fixup = true; > fixup_start_addr = run_start - host_offset; > /* > * This host page has gone, the next loop iteration starts > @@ -2905,7 +2903,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, > */ > host_offset = run_end % host_ratio; > if (host_offset) { > - do_fixup = true; > fixup_start_addr = run_end - host_offset; > /* > * This host page has gone, the next loop iteration starts > @@ -2921,7 +2918,7 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, > } > } > > - if (do_fixup) { > + if (host_offset) { > unsigned long page; > > /* Tell the destination to discard this page */ > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index c4dc36e525..b0ca0059c4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2873,7 +2873,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, } while (run_start < pages) { - bool do_fixup = false; unsigned long fixup_start_addr; unsigned long host_offset; @@ -2883,7 +2882,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, */ host_offset = run_start % host_ratio; if (host_offset) { - do_fixup = true; fixup_start_addr = run_start - host_offset; /* * This host page has gone, the next loop iteration starts @@ -2905,7 +2903,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, */ host_offset = run_end % host_ratio; if (host_offset) { - do_fixup = true; fixup_start_addr = run_end - host_offset; /* * This host page has gone, the next loop iteration starts @@ -2921,7 +2918,7 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, } } - if (do_fixup) { + if (host_offset) { unsigned long page; /* Tell the destination to discard this page */
This means it is not necessary to spare an extra variable to hold this condition. Use host_offset directly is fine. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/ram.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)