On 24/02/2017 19:28, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com> > > Create ram_block_discard_range in exec.c to replace > postcopy_ram_discard_range and most of ram_discard_range. > > Those two routines are a bit of a weird combination, and > ram_discard_range is about to get more complex for hugepages. > It's OS dependent code (so shouldn't be in migration/ram.c) but > it needs quite a bit of the innards of RAMBlock so doesn't belong in > the os*.c. > > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > Reviewed-by: Juan Quintela <quint...@redhat.com> > --- > exec.c | 54 > ++++++++++++++++++++++++++++++++++++++++ > include/exec/cpu-common.h | 1 + > include/migration/postcopy-ram.h | 7 ------ > migration/postcopy-ram.c | 30 +--------------------- > migration/ram.c | 24 +++--------------- > migration/trace-events | 2 +- > 6 files changed, 60 insertions(+), 58 deletions(-) > > diff --git a/exec.c b/exec.c > index 865a1e8..ddbc314 100644 > --- a/exec.c > +++ b/exec.c > @@ -45,6 +45,7 @@ > #include "exec/address-spaces.h" > #include "sysemu/xen-mapcache.h" > #include "trace-root.h" > + > #endif
It seems a blank line has "migrated" here from PATCH v2 11/16. ;) Reviewed-by: Laurent Vivier <lviv...@redhat.com>