Message ID | 20191006000249.29926-2-richardw.yang@linux.intel.com |
---|---|
State | New |
Headers | show |
Series | migration/postcopy: replace have_listen_thread check with PostcopyState check | expand |
* Wei Yang (richardw.yang@linux.intel.com) wrote: > If mis->have_listen_thread is true, this means current PostcopyState > must be LISTENING or RUNNING. While the check at the beginning of the > function makes sure the state transaction happens when its previous > PostcopyState is ADVISE or DISCARD. > > This means we would never touch this check. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Yes, OK - although I think it's OK sometimes to leave in checks for things you don't expect to happen! Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/savevm.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index feb757de79..eaa4cf58ef 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1878,11 +1878,6 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) > return -1; > } > > - if (mis->have_listen_thread) { > - error_report("CMD_POSTCOPY_RAM_LISTEN already has a listen thread"); > - return -1; > - } > - > mis->have_listen_thread = true; > /* Start up the listening thread and wait for it to signal ready */ > qemu_sem_init(&mis->listen_thread_sem, 0); > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/savevm.c b/migration/savevm.c index feb757de79..eaa4cf58ef 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1878,11 +1878,6 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) return -1; } - if (mis->have_listen_thread) { - error_report("CMD_POSTCOPY_RAM_LISTEN already has a listen thread"); - return -1; - } - mis->have_listen_thread = true; /* Start up the listening thread and wait for it to signal ready */ qemu_sem_init(&mis->listen_thread_sem, 0);
If mis->have_listen_thread is true, this means current PostcopyState must be LISTENING or RUNNING. While the check at the beginning of the function makes sure the state transaction happens when its previous PostcopyState is ADVISE or DISCARD. This means we would never touch this check. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/savevm.c | 5 ----- 1 file changed, 5 deletions(-)