On Thu, Aug 03, 2017 at 10:49:02AM +0100, Dr. David Alan Gilbert wrote:
> * Peter Xu (pet...@redhat.com) wrote:
> > Add a new vm command MIG_CMD_RECV_BITMAP to request received bitmap for
> > one ramblock.
> >
> > Signed-off-by: Peter Xu <pet...@redhat.com>
> > ---
> > 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 <dgilb...@redhat.com>
Thanks!
--
Peter Xu
