[libvirt PATCH] qemu: Rename virDomainAsyncJobPhase{From,To}String
Recent refactor (v8.1.0-217-ga193f4bef6) generalized job related enums
and functions by changing "qemu" prefix to "vir" and moving them to
src/hypervisor/domain_job.[ch]. This was in most cases a good thing, but
async job phases are driver specific and the corresponding functions
remained in src/qemu/qemu_domainjob.[ch], but still their prefix was
changed to "vir". Let's change it back to "qemu".
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_domainjob.c | 10 +++++-----
src/qemu/qemu_domainjob.h | 4 ++--
src/qemu/qemu_migration.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 56a3f6cb19..1cddc7f2f0 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -74,7 +74,7 @@ qemuDomainJobSetStatsType(virDomainJobData *jobData,
const char *
-virDomainAsyncJobPhaseToString(virDomainAsyncJob job,
+qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job,
int phase G_GNUC_UNUSED)
{
switch (job) {
@@ -97,7 +97,7 @@ virDomainAsyncJobPhaseToString(virDomainAsyncJob job,
}
int
-virDomainAsyncJobPhaseFromString(virDomainAsyncJob job,
+qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job,
const char *phase)
{
if (!phase)
@@ -682,7 +682,7 @@ qemuDomainObjSetJobPhase(virDomainObj *obj,
VIR_DEBUG("Setting '%s' phase to '%s'",
virDomainAsyncJobTypeToString(priv->job.asyncJob),
- virDomainAsyncJobPhaseToString(priv->job.asyncJob, phase));
+ qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase));
if (priv->job.asyncOwner == 0) {
priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet());
@@ -1191,7 +1191,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
if (priv->job.phase) {
virBufferAsprintf(&attrBuf, " phase='%s'",
- virDomainAsyncJobPhaseToString(priv->job.asyncJob,
+ qemuDomainAsyncJobPhaseToString(priv->job.asyncJob,
priv->job.phase));
}
@@ -1244,7 +1244,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
priv->job.asyncJob = async;
if ((tmp = virXPathString("string(@phase)", ctxt))) {
- priv->job.phase = virDomainAsyncJobPhaseFromString(async, tmp);
+ priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp);
if (priv->job.phase < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown job phase %s"), tmp);
diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index faf47105a3..f67eace36c 100644
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -119,9 +119,9 @@ struct _qemuDomainJobObj {
void qemuDomainJobSetStatsType(virDomainJobData *jobData,
qemuDomainJobStatsType type);
-const char *virDomainAsyncJobPhaseToString(virDomainAsyncJob job,
+const char *qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job,
int phase);
-int virDomainAsyncJobPhaseFromString(virDomainAsyncJob job,
+int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job,
const char *phase);
void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver,
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 3e653543c6..98f82abe7c 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2190,7 +2190,7 @@ qemuMigrationSrcCleanup(virDomainObj *vm,
VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s",
vm->def->name, conn,
virDomainAsyncJobTypeToString(priv->job.asyncJob),
- virDomainAsyncJobPhaseToString(priv->job.asyncJob,
+ qemuDomainAsyncJobPhaseToString(priv->job.asyncJob,
priv->job.phase));
if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT))
--
2.35.1