External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename virDomainAsyncJobPhase{From,To}String

Browse Source 
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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2022-03-30 09:39:12 +02:00
parent 0e4ee0ed3b
commit 3fa815f4f7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_domainjob.c
View File

@ -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);

4
src/qemu/qemu_domainjob.h
View File

@ -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,

2
src/qemu/qemu_migration.c
View File

@ -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))