From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxEQO-0004W7-4U for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:16:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxEQH-0003Ah-Vf for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:16:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxEQH-0003AS-Mj for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:16:13 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0LAGDDS005231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Jan 2013 05:16:13 -0500 Message-ID: <50FD15B5.2090403@redhat.com> Date: Mon, 21 Jan 2013 12:17:25 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1358510033-17268-1-git-send-email-quintela@redhat.com> <1358510033-17268-4-git-send-email-quintela@redhat.com> In-Reply-To: <1358510033-17268-4-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/4] ram: reuse ram_save_iterate() for the complete stage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 01/18/2013 01:53 PM, Juan Quintela wrote: > This means that we only have one memory loop for the iterate and > complete phase. > > Signed-off-by: Juan Quintela > --- > arch_init.c | 16 ---------------- > migration.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 16 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 9f7d44d..9eef10a 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -651,23 +651,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque, uint64_t free_space) > static int ram_save_complete(QEMUFile *f, void *opaque) > { > qemu_mutex_lock_ramlist(); do we still need to lock ramlist here? > - migration_bitmap_sync(); > - > - /* try transferring iterative blocks of memory */ > - > - /* flush all remaining blocks regardless of rate limiting */ > - while (true) { > - int bytes_sent; > - > - bytes_sent = ram_save_block(f); > - /* no more blocks to sent */ > - if (bytes_sent == 0) { > - break; > - } > - bytes_transferred += bytes_sent; > - } > migration_end(); > - > qemu_mutex_unlock_ramlist(); > qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > > diff --git a/migration.c b/migration.c > index e74ce49..de665f7 100644 > --- a/migration.c > +++ b/migration.c > @@ -717,6 +717,18 @@ static void *buffered_file_thread(void *opaque) > } else { > vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); > } > + > + /* 8 is the size of an end of section mark, so empty section */ > + while ((ret = qemu_savevm_state_iterate(s->file, free_space)) > + > 8) { Sorry I don't understand this condition, can you explain? Regards, Orit > + ret = buffered_flush(s); > + if (ret < 0) { > + qemu_mutex_unlock_iothread(); > + break; > + } > + free_space = s->buffer_capacity - s->buffer_size; > + } > + > ret = qemu_savevm_state_complete(s->file); > if (ret < 0) { > qemu_mutex_unlock_iothread(); >