Message ID | 1363956370-23681-7-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
On 03/22/2013 02:46 PM, Peter Lieven wrote: > the first round of ram transfer is special since all pages > are dirty and thus all memory pages are transferred to > the target. this patch adds a boolean variable to track > this stage. > > Signed-off-by: Peter Lieven <pl@kamp.de> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > arch_init.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch_init.c b/arch_init.c > index 9ebca83..4c4caf4 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -317,6 +317,7 @@ static ram_addr_t last_offset; > static unsigned long *migration_bitmap; > static uint64_t migration_dirty_pages; > static uint32_t last_version; > +static bool ram_bulk_stage; > > static inline > ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, > @@ -424,6 +425,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) > if (!block) { > block = QTAILQ_FIRST(&ram_list.blocks); > complete_round = true; > + ram_bulk_stage = false; > } > } else { > uint8_t *p; > @@ -527,6 +529,7 @@ static void reset_ram_globals(void) > last_sent_block = NULL; > last_offset = 0; > last_version = ram_list.version; > + ram_bulk_stage = true; > } > > #define MAX_WAIT 50 /* ms, half buffered_file limit */ > Reviewed-by: Orit Wasserman <owasserm@redhat.com>
diff --git a/arch_init.c b/arch_init.c index 9ebca83..4c4caf4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -317,6 +317,7 @@ static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; static uint32_t last_version; +static bool ram_bulk_stage; static inline ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, @@ -424,6 +425,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) if (!block) { block = QTAILQ_FIRST(&ram_list.blocks); complete_round = true; + ram_bulk_stage = false; } } else { uint8_t *p; @@ -527,6 +529,7 @@ static void reset_ram_globals(void) last_sent_block = NULL; last_offset = 0; last_version = ram_list.version; + ram_bulk_stage = true; } #define MAX_WAIT 50 /* ms, half buffered_file limit */