On Thu, Jul 21, 2016 at 12:10:11PM +0200, Greg Kurz wrote: > On Thu, 21 Jul 2016 11:21:34 +0200 > Thomas Huth <th...@redhat.com> wrote: > > > When canceling a migration process, we currently do not close the > > HTAB migration file descriptor since htab_save_complete() is never > > called in that case. So we leave the migration process with a > > dangling htab_fd value around, and this causes any further migration > > attempts to fail. To fix this issue, simply make sure that the > > htab_fd is closed during the migration cleanup stage. And since the > > cleanup() function is also called when migration succeeds, we can > > also remove the call to close_htab_fd() from the htab_save_complete() > > function. > > > > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1354341 > > Signed-off-by: Thomas Huth <th...@redhat.com> > > --- > > Reviewed-by: Greg Kurz <gr...@kaod.org>
Applied to ppc-for-2.7
>
> > hw/ppc/spapr.c | 9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 7f33a1b..9193ac2 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -1512,7 +1512,6 @@ static int htab_save_complete(QEMUFile *f, void
> > *opaque)
> > if (rc < 0) {
> > return rc;
> > }
> > - close_htab_fd(spapr);
> > } else {
> > if (spapr->htab_first_pass) {
> > htab_save_first_pass(f, spapr, -1);
> > @@ -1614,10 +1613,18 @@ static int htab_load(QEMUFile *f, void *opaque, int
> > version_id)
> > return 0;
> > }
> >
> > +static void htab_cleanup(void *opaque)
> > +{
> > + sPAPRMachineState *spapr = opaque;
> > +
> > + close_htab_fd(spapr);
> > +}
> > +
> > static SaveVMHandlers savevm_htab_handlers = {
> > .save_live_setup = htab_save_setup,
> > .save_live_iterate = htab_save_iterate,
> > .save_live_complete_precopy = htab_save_complete,
> > + .cleanup = htab_cleanup,
> > .load_state = htab_load,
> > };
> >
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
