diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2016-02-11 10:40:44 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-02-17 09:59:30 +1100 |
| commit | 378bc21756f016abfde16a0de4977be49f499b1c (patch) | |
| tree | a1ec0ecbc297b42719beb2e34a64faadbc25593f /hw/ppc | |
| parent | fa48b4328c39b2532e47efcfcba6d4031512f514 (diff) | |
| download | qemu-378bc21756f016abfde16a0de4977be49f499b1c.tar.gz qemu-378bc21756f016abfde16a0de4977be49f499b1c.tar.bz2 qemu-378bc21756f016abfde16a0de4977be49f499b1c.zip | |
migration: ensure htab_save_first completes after timeout
htab_save_first_pass could return without finishing its work due to
timeout. The patch checks if another invocation of it is necessary and
will call it in htab_save_complete if necessary.
Signed-off-by: Jianjun Duan <duanj@linux.vnet.ibm.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
[removed overlong line]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c85a12547f..276d6b4ceb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1312,6 +1312,7 @@ static int htab_save_setup(QEMUFile *f, void *opaque) static void htab_save_first_pass(QEMUFile *f, sPAPRMachineState *spapr, int64_t max_ns) { + bool has_timeout = max_ns != -1; int htabslots = HTAB_SIZE(spapr) / HASH_PTE_SIZE_64; int index = spapr->htab_save_index; int64_t starttime = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); @@ -1345,7 +1346,8 @@ static void htab_save_first_pass(QEMUFile *f, sPAPRMachineState *spapr, qemu_put_buffer(f, HPTE(spapr->htab, chunkstart), HASH_PTE_SIZE_64 * n_valid); - if ((qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - starttime) > max_ns) { + if (has_timeout && + (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - starttime) > max_ns) { break; } } @@ -1498,6 +1500,9 @@ static int htab_save_complete(QEMUFile *f, void *opaque) } close_htab_fd(spapr); } else { + if (spapr->htab_first_pass) { + htab_save_first_pass(f, spapr, -1); + } htab_save_later_pass(f, spapr, -1); } |