hw/ppc/spapr: Make sure to close the htab_fd when migration is canceled
commitc573fc03da65e35bf44bce0448ea12801e3631ac
authorThomas Huth <thuth@redhat.com>
Thu, 21 Jul 2016 09:21:34 +0000 (21 11:21 +0200)
committerDavid Gibson <david@gibson.dropbear.id.au>
Mon, 25 Jul 2016 00:19:30 +0000 (25 10:19 +1000)
tree6a8679e649d02b372b71255e1d93c43a47870bdf
parent3d4f2534834cd9f9bbb3dd145fa61fd2ac0dd535
hw/ppc/spapr: Make sure to close the htab_fd when migration is canceled

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 <thuth@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
hw/ppc/spapr.c