Message ID | 1341323574-23206-10-git-send-email-owasserm@redhat.com |
---|---|
State | New |
Headers | show |
On 07/03/2012 07:52 AM, Orit Wasserman wrote: > Signed-off-by: Orit Wasserman <owasserm@redhat.com> > --- > arch_init.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) You failed to account for my v13 review that you missed a hunk in this patch (you mistakenly delayed it to 11/13). Furthermore, hasn't this patch (and several others) were already picked up by Juan; you should rebase on top of his pull request.
On 07/03/2012 11:38 PM, Eric Blake wrote: > On 07/03/2012 07:52 AM, Orit Wasserman wrote: >> Signed-off-by: Orit Wasserman <owasserm@redhat.com> >> --- >> arch_init.c | 7 ++++++- >> 1 files changed, 6 insertions(+), 1 deletions(-) > > You failed to account for my v13 review that you missed a hunk in this > patch (you mistakenly delayed it to 11/13). Furthermore, hasn't this > patch (and several others) were already picked up by Juan; you should > rebase on top of his pull request. > Agreed.
diff --git a/arch_init.c b/arch_init.c index e763909..66df017 100644 --- a/arch_init.c +++ b/arch_init.c @@ -304,6 +304,11 @@ static void sort_ram_list(void) g_free(blocks); } +static void migration_end(void) +{ + memory_global_dirty_log_stop(); +} + int ram_save_live(QEMUFile *f, int stage, void *opaque) { ram_addr_t addr; @@ -313,7 +318,7 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque) int ret; if (stage < 0) { - memory_global_dirty_log_stop(); + migration_end(); return 0; }
Signed-off-by: Orit Wasserman <owasserm@redhat.com> --- arch_init.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)