diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:49:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:49:16 -0500 |
| commit | 6453a3a69488196f26d12654c6b148446abdf3d6 (patch) | |
| tree | 18c32e6d80c54c0ecc6edfe0ddbccbe63a6afd5a /include | |
| parent | 2562becfc126ed7678c662ee23b7c1fe135d8966 (diff) | |
| parent | 7ca1dfad952d8a8655b32e78623edcc38a51b14a (diff) | |
Merge remote-tracking branch 'quintela/migration.next' into staging
# By Chegu Vinod
# Via Juan Quintela
* quintela/migration.next:
Force auto-convegence of live migration
Add 'auto-converge' migration capability
Introduce async_run_on_cpu()
Message-id: 1373664508-5404-1-git-send-email-quintela@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/migration/migration.h | 2 | ||||
| -rw-r--r-- | include/qemu-common.h | 1 | ||||
| -rw-r--r-- | include/qom/cpu.h | 10 |
3 files changed, 13 insertions, 0 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index f0640e0eec..bc9fde0b2a 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -125,6 +125,8 @@ void migrate_del_blocker(Error *reason); bool migrate_rdma_pin_all(void); +bool migrate_auto_converge(void); + int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, uint8_t *dst, int dlen); int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); diff --git a/include/qemu-common.h b/include/qemu-common.h index f4397388f5..6948bb9177 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -293,6 +293,7 @@ struct qemu_work_item { void (*func)(void *data); void *data; int done; + bool free; }; diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 147c256949..dfd81a1d2f 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -379,6 +379,16 @@ bool cpu_is_stopped(CPUState *cpu); void run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); /** + * async_run_on_cpu: + * @cpu: The vCPU to run on. + * @func: The function to be executed. + * @data: Data to pass to the function. + * + * Schedules the function @func for execution on the vCPU @cpu asynchronously. + */ +void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data); + +/** * qemu_for_each_cpu: * @func: The function to be executed. * @data: Data to pass to the function. |