提交 db226378 编写于 作者: J Jiri Denemark

qemu: Typedef struct qemuDomainJobObj

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 bbe60aac
...@@ -309,7 +309,7 @@ qemuDomainObjInitJob(qemuDomainObjPrivatePtr priv) ...@@ -309,7 +309,7 @@ qemuDomainObjInitJob(qemuDomainObjPrivatePtr priv)
static void static void
qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv) qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv)
{ {
struct qemuDomainJobObj *job = &priv->job; qemuDomainJobObjPtr job = &priv->job;
job->active = QEMU_JOB_NONE; job->active = QEMU_JOB_NONE;
job->owner = 0; job->owner = 0;
...@@ -320,7 +320,7 @@ qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv) ...@@ -320,7 +320,7 @@ qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv)
static void static void
qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv) qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
{ {
struct qemuDomainJobObj *job = &priv->job; qemuDomainJobObjPtr job = &priv->job;
job->asyncJob = QEMU_ASYNC_JOB_NONE; job->asyncJob = QEMU_ASYNC_JOB_NONE;
job->asyncOwner = 0; job->asyncOwner = 0;
...@@ -342,7 +342,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv) ...@@ -342,7 +342,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
void void
qemuDomainObjRestoreJob(virDomainObjPtr obj, qemuDomainObjRestoreJob(virDomainObjPtr obj,
struct qemuDomainJobObj *job) qemuDomainJobObjPtr job)
{ {
qemuDomainObjPrivatePtr priv = obj->privateData; qemuDomainObjPrivatePtr priv = obj->privateData;
......
...@@ -154,7 +154,9 @@ struct _qemuDomainJobInfo { ...@@ -154,7 +154,9 @@ struct _qemuDomainJobInfo {
qemuDomainMirrorStats mirrorStats; qemuDomainMirrorStats mirrorStats;
}; };
struct qemuDomainJobObj { typedef struct _qemuDomainJobObj qemuDomainJobObj;
typedef qemuDomainJobObj *qemuDomainJobObjPtr;
struct _qemuDomainJobObj {
virCond cond; /* Use to coordinate jobs */ virCond cond; /* Use to coordinate jobs */
qemuDomainJob active; /* Currently running job */ qemuDomainJob active; /* Currently running job */
unsigned long long owner; /* Thread id which set current job */ unsigned long long owner; /* Thread id which set current job */
...@@ -254,7 +256,7 @@ typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr; ...@@ -254,7 +256,7 @@ typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr;
struct _qemuDomainObjPrivate { struct _qemuDomainObjPrivate {
virQEMUDriverPtr driver; virQEMUDriverPtr driver;
struct qemuDomainJobObj job; qemuDomainJobObj job;
virBitmapPtr namespaces; virBitmapPtr namespaces;
...@@ -513,7 +515,7 @@ void qemuDomainObjSetJobPhase(virQEMUDriverPtr driver, ...@@ -513,7 +515,7 @@ void qemuDomainObjSetJobPhase(virQEMUDriverPtr driver,
void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj, void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj,
unsigned long long allowedJobs); unsigned long long allowedJobs);
void qemuDomainObjRestoreJob(virDomainObjPtr obj, void qemuDomainObjRestoreJob(virDomainObjPtr obj,
struct qemuDomainJobObj *job); qemuDomainJobObjPtr job);
void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver,
virDomainObjPtr obj); virDomainObjPtr obj);
void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj);
......
...@@ -3180,7 +3180,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, ...@@ -3180,7 +3180,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
static int static int
qemuProcessRecoverJob(virQEMUDriverPtr driver, qemuProcessRecoverJob(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const struct qemuDomainJobObj *job, const qemuDomainJobObj *job,
unsigned int *stopFlags) unsigned int *stopFlags)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
...@@ -7256,7 +7256,7 @@ qemuProcessReconnect(void *opaque) ...@@ -7256,7 +7256,7 @@ qemuProcessReconnect(void *opaque)
virQEMUDriverPtr driver = data->driver; virQEMUDriverPtr driver = data->driver;
virDomainObjPtr obj = data->obj; virDomainObjPtr obj = data->obj;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
struct qemuDomainJobObj oldjob; qemuDomainJobObj oldjob;
int state; int state;
int reason; int reason;
virQEMUDriverConfigPtr cfg; virQEMUDriverConfigPtr cfg;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册