[libvirt] [PATCH v3 06/11] qemu: remove QEMU_JOB_ASYNC_NESTED
We can safely remove this value particularly because it could not
be saved in status file because when nested job is started no
other thread can execute concurrent regular job which in turn can save
status file.
---
src/qemu/qemu_domain.c | 3 ---
src/qemu/qemu_domain.h | 1 -
src/qemu/qemu_process.c | 1 -
3 files changed, 5 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index edf204e..782bd43 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -89,7 +89,6 @@ VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST,
"abort",
"migration operation",
"none", /* async job is never stored in job.active */
- "async nested",
);
VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST,
@@ -4277,8 +4276,6 @@ qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver,
virDomainObjPtr obj)
{
qemuDomainObjPrivatePtr priv = obj->privateData;
- if (priv->job.active == QEMU_JOB_ASYNC_NESTED)
- qemuDomainObjResetJob(priv);
qemuDomainObjResetAsyncJob(priv);
qemuDomainObjSaveJob(driver, obj);
}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 1729761..146a8f2 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -75,7 +75,6 @@ typedef enum {
/* The following two items must always be the last items before JOB_LAST */
QEMU_JOB_ASYNC, /* Asynchronous job */
- QEMU_JOB_ASYNC_NESTED, /* Normal job within an async job */
QEMU_JOB_LAST
} qemuDomainJob;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 7eaeeaa..a33fa69 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3201,7 +3201,6 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
case QEMU_JOB_MIGRATION_OP:
case QEMU_JOB_ABORT:
case QEMU_JOB_ASYNC:
- case QEMU_JOB_ASYNC_NESTED:
/* async job was already handled above */
case QEMU_JOB_NONE:
case QEMU_JOB_LAST:
--
1.8.3.1