External/libvirt
1
0
Fork 0
Code

qemu: Use domain condition for asyncAbort

Browse Source 
To avoid polling for asyncAbort flag changes.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-05-15 15:59:49 +02:00
parent e8f263e0d0
commit d814c70b3b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_domain.c
View File

@ -169,7 +169,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
job->phase = 0; job->phase = 0;
job->mask = QEMU_JOB_DEFAULT_MASK; job->mask = QEMU_JOB_DEFAULT_MASK;
job->dump_memory_only = false; job->dump_memory_only = false;
job->asyncAbort = false; job->abortJob = false;
VIR_FREE(job->current); VIR_FREE(job->current);
} }
@ -1652,7 +1652,8 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj)
qemuDomainAsyncJobTypeToString(priv->job.asyncJob), qemuDomainAsyncJobTypeToString(priv->job.asyncJob),
obj, obj->def->name); obj, obj->def->name);
priv->job.asyncAbort = true; priv->job.abortJob = true;
virDomainObjBroadcast(obj);
} }
/* /*

2
src/qemu/qemu_domain.h
View File

@ -135,7 +135,7 @@ struct qemuDomainJobObj {
bool dump_memory_only; /* use dump-guest-memory to do dump */ bool dump_memory_only; /* use dump-guest-memory to do dump */
qemuDomainJobInfoPtr current; /* async job progress data */ qemuDomainJobInfoPtr current; /* async job progress data */
qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */ qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */
bool asyncAbort; /* abort of async job requested */ bool abortJob; /* abort of the job requested */
}; };
typedef void (*qemuDomainCleanupCallback)(virQEMUDriverPtr driver, typedef void (*qemuDomainCleanupCallback)(virQEMUDriverPtr driver,

11
src/qemu/qemu_migration.c
View File

@ -2084,12 +2084,10 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver,
} }
while ((rv = qemuMigrationDriveMirrorReady(driver, vm)) != 1) { while ((rv = qemuMigrationDriveMirrorReady(driver, vm)) != 1) {
unsigned long long now;
if (rv < 0) if (rv < 0)
goto cleanup; goto cleanup;
if (priv->job.asyncAbort) { if (priv->job.abortJob) {
priv->job.current->type = VIR_DOMAIN_JOB_CANCELLED; priv->job.current->type = VIR_DOMAIN_JOB_CANCELLED;
virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"),
qemuDomainAsyncJobTypeToString(priv->job.asyncJob), qemuDomainAsyncJobTypeToString(priv->job.asyncJob),
@ -2097,8 +2095,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (virTimeMillisNow(&now) < 0 || if (virDomainObjWait(vm) < 0)
virDomainObjWaitUntil(vm, now + 500) < 0)
goto cleanup; goto cleanup;
} }
@ -4154,10 +4151,10 @@ qemuMigrationRun(virQEMUDriverPtr driver,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cleanup; goto cleanup;
if (priv->job.asyncAbort) { if (priv->job.abortJob) {
/* explicitly do this *after* we entered the monitor, /* explicitly do this *after* we entered the monitor,
* as this is a critical section so we are guaranteed * as this is a critical section so we are guaranteed
* priv->job.asyncAbort will not change */ * priv->job.abortJob will not change */
ignore_value(qemuDomainObjExitMonitor(driver, vm)); ignore_value(qemuDomainObjExitMonitor(driver, vm));
priv->job.current->type = VIR_DOMAIN_JOB_CANCELLED; priv->job.current->type = VIR_DOMAIN_JOB_CANCELLED;
virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"),