| Message ID | 20180710094424.30754-1-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-3.0] migration: reorder MIG_CMD_POSTCOPY_RESUME | expand |
* Peter Xu (peterx@redhat.com) wrote: > It was accidently added before MIG_CMD_PACKAGED so it might break > command compatibility when we run postcopy migration between old/new > QEMUs. Fix that up quickly before the QEMU 3.0 release. > > Reported-by: Lukáš Doktor <ldoktor@redhat.com> > Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/savevm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index c2f34ffc7c..0d2c4a0739 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -81,8 +81,8 @@ enum qemu_vm_cmd { > MIG_CMD_POSTCOPY_RAM_DISCARD, /* A list of pages to discard that > were previously sent during > precopy but are dirty. */ > - MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */ > + MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */ > MIG_CMD_MAX > }; > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
* Peter Xu (peterx@redhat.com) wrote: > It was accidently added before MIG_CMD_PACKAGED so it might break > command compatibility when we run postcopy migration between old/new > QEMUs. Fix that up quickly before the QEMU 3.0 release. > > Reported-by: Lukáš Doktor <ldoktor@redhat.com> > Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> Queued > --- > migration/savevm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index c2f34ffc7c..0d2c4a0739 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -81,8 +81,8 @@ enum qemu_vm_cmd { > MIG_CMD_POSTCOPY_RAM_DISCARD, /* A list of pages to discard that > were previously sent during > precopy but are dirty. */ > - MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */ > + MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */ > MIG_CMD_MAX > }; > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Peter Xu <peterx@redhat.com> wrote: > It was accidently added before MIG_CMD_PACKAGED so it might break > command compatibility when we run postcopy migration between old/new > QEMUs. Fix that up quickly before the QEMU 3.0 release. > > Reported-by: Lukáš Doktor <ldoktor@redhat.com> > Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> > --- > migration/savevm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index c2f34ffc7c..0d2c4a0739 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -81,8 +81,8 @@ enum qemu_vm_cmd { > MIG_CMD_POSTCOPY_RAM_DISCARD, /* A list of pages to discard that > were previously sent during > precopy but are dirty. */ > - MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */ > + MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ > MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */ > MIG_CMD_MAX > };
diff --git a/migration/savevm.c b/migration/savevm.c index c2f34ffc7c..0d2c4a0739 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -81,8 +81,8 @@ enum qemu_vm_cmd { MIG_CMD_POSTCOPY_RAM_DISCARD, /* A list of pages to discard that were previously sent during precopy but are dirty. */ - MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */ + MIG_CMD_POSTCOPY_RESUME, /* resume postcopy on dest */ MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */ MIG_CMD_MAX };
It was accidently added before MIG_CMD_PACKAGED so it might break command compatibility when we run postcopy migration between old/new QEMUs. Fix that up quickly before the QEMU 3.0 release. Reported-by: Lukáš Doktor <ldoktor@redhat.com> Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)