| Message ID | 20191005220517.24029-2-richardw.yang@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: trivial cleanup and refine | expand |
* Wei Yang (richardw.yang@linux.intel.com) wrote: > The only possible bit set in invalid_flags is > RAM_SAVE_FLAG_COMPRESS_PAGE at the beginning of function > ram_load_precopy(), which means it is not necessary to do > another check for RAM_SAVE_FLAG_COMPRESS_PAGE bit. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > --- > migration/ram.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 31051935c8..769d3f6454 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -4263,10 +4263,7 @@ static int ram_load_precopy(QEMUFile *f) > addr &= TARGET_PAGE_MASK; > > if (flags & invalid_flags) { > - if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { > - error_report("Received an unexpected compressed page"); > - } > - > + error_report("Received an unexpected compressed page"); > ret = -EINVAL; I'd rather keep this one; I think Juan's idea is that we might make other flags illegal here and then it's easy to add to invalid_flags at the top. Dave > break; > } > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On Tue, Oct 08, 2019 at 06:38:25PM +0100, Dr. David Alan Gilbert wrote: >* Wei Yang (richardw.yang@linux.intel.com) wrote: >> The only possible bit set in invalid_flags is >> RAM_SAVE_FLAG_COMPRESS_PAGE at the beginning of function >> ram_load_precopy(), which means it is not necessary to do >> another check for RAM_SAVE_FLAG_COMPRESS_PAGE bit. >> >> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> >> --- >> migration/ram.c | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/migration/ram.c b/migration/ram.c >> index 31051935c8..769d3f6454 100644 >> --- a/migration/ram.c >> +++ b/migration/ram.c >> @@ -4263,10 +4263,7 @@ static int ram_load_precopy(QEMUFile *f) >> addr &= TARGET_PAGE_MASK; >> >> if (flags & invalid_flags) { >> - if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { >> - error_report("Received an unexpected compressed page"); >> - } >> - >> + error_report("Received an unexpected compressed page"); >> ret = -EINVAL; > >I'd rather keep this one; I think Juan's idea is that we might make >other flags illegal here and then it's easy to add to invalid_flags at >the top. > Reasonable. >Dave >> break; >> } >> -- >> 2.17.1 >> >-- >Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index 31051935c8..769d3f6454 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4263,10 +4263,7 @@ static int ram_load_precopy(QEMUFile *f) addr &= TARGET_PAGE_MASK; if (flags & invalid_flags) { - if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { - error_report("Received an unexpected compressed page"); - } - + error_report("Received an unexpected compressed page"); ret = -EINVAL; break; }
The only possible bit set in invalid_flags is RAM_SAVE_FLAG_COMPRESS_PAGE at the beginning of function ram_load_precopy(), which means it is not necessary to do another check for RAM_SAVE_FLAG_COMPRESS_PAGE bit. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/ram.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)