From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVmt-0006Tg-BQ for qemu-devel@nongnu.org; Fri, 04 Aug 2017 02:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVmq-0001Er-Ja for qemu-devel@nongnu.org; Fri, 04 Aug 2017 02:08:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddVmq-0001Cv-Ak for qemu-devel@nongnu.org; Fri, 04 Aug 2017 02:08:40 -0400 Date: Fri, 4 Aug 2017 14:08:33 +0800 From: Peter Xu Message-ID: <20170804060833.GF5561@pxdev.xzpeter.org> References: <1501229198-30588-1-git-send-email-peterx@redhat.com> <1501229198-30588-22-git-send-email-peterx@redhat.com> <20170803094901.GC2076@work-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170803094901.GC2076@work-vm> Subject: Re: [Qemu-devel] [RFC 21/29] migration: new cmd MIG_CMD_RECV_BITMAP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" Cc: qemu-devel@nongnu.org, Laurent Vivier , Alexey Perevalov , Juan Quintela , Andrea Arcangeli On Thu, Aug 03, 2017 at 10:49:02AM +0100, Dr. David Alan Gilbert wrote: > * Peter Xu (peterx@redhat.com) wrote: > > Add a new vm command MIG_CMD_RECV_BITMAP to request received bitmap for > > one ramblock. > > > > Signed-off-by: Peter Xu > > --- > > migration/savevm.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > migration/savevm.h | 1 + > > migration/trace-events | 1 + > > 3 files changed, 61 insertions(+) > > > > diff --git a/migration/savevm.c b/migration/savevm.c > > index 386788d..0ab13c0 100644 > > --- a/migration/savevm.c > > +++ b/migration/savevm.c > > @@ -78,6 +78,7 @@ enum qemu_vm_cmd { > > were previously sent during > > precopy but are dirty. */ > > MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */ > > + MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */ > > MIG_CMD_MAX > > }; > > > > @@ -95,6 +96,7 @@ static struct mig_cmd_args { > > [MIG_CMD_POSTCOPY_RAM_DISCARD] = { > > .len = -1, .name = "POSTCOPY_RAM_DISCARD" }, > > [MIG_CMD_PACKAGED] = { .len = 4, .name = "PACKAGED" }, > > + [MIG_CMD_RECV_BITMAP] = { .len = -1, .name = "RECV_BITMAP" }, > > [MIG_CMD_MAX] = { .len = -1, .name = "MAX" }, > > }; > > > > @@ -929,6 +931,19 @@ void qemu_savevm_send_postcopy_run(QEMUFile *f) > > qemu_savevm_command_send(f, MIG_CMD_POSTCOPY_RUN, 0, NULL); > > } > > > > +void qemu_savevm_send_recv_bitmap(QEMUFile *f, char *block_name) > > +{ > > + size_t len; > > + char buf[512]; > > Only needs to be 256 bytes? Yes, it is. Even, I guess I should use dynamic allocation, since 256 has the assumption of block_name size. [...] > > +static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis, > > + uint16_t len) > > +{ > > + QEMUFile *file = mis->from_src_file; > > + RAMBlock *rb; > > + char block_name[256]; > > + size_t cnt; > > + > > + cnt = qemu_get_counted_string(file, block_name); > > + if (!cnt) { > > + error_report("%s: failed to read block name", __func__); > > + return -EINVAL; > > + } > > + > > + /* Validate before using the data */ > > + if (qemu_file_get_error(file)) { > > + return qemu_file_get_error(file); > > + } > > + > > + if (len != cnt + 1) { > > + error_report("%s: invalid payload length (%d)", __func__, len); > > + return -EINVAL; > > + } > > + > > + rb = qemu_ram_block_by_name(block_name); > > + if (!rb) { > > + error_report("%s: block '%s' not found", __func__, block_name); > > + return -EINVAL; > > + } > > + > > + /* TODO: send the bitmap back to source */ > > Probably worth adding a trace in this function somewhere. Will do. > > Other than that; > > > Reviewed-by: Dr. David Alan Gilbert Thanks! -- Peter Xu