[libvirt] [PATCH v2 09/10] qemu: don't export migration job APIs

These APIs are not required anywhere outside the migration code so need not be exported to the rest of the QEMU driver. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/qemu/qemu_migration.c | 43 +++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 32 -------------------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6edadac719..29247d6a39 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -83,6 +83,37 @@ VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST, #define QEMU_MIGRATION_TLS_ALIAS_BASE "libvirt_migrate" +static int +qemuMigrationJobStart(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob job) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +static void +qemuMigrationJobSetPhase(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationJobPhase phase) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + +static void +qemuMigrationJobStartPhase(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationJobPhase phase) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + +static void +qemuMigrationJobContinue(virDomainObjPtr obj) + ATTRIBUTE_NONNULL(1); + +static bool +qemuMigrationJobIsActive(virDomainObjPtr vm, + qemuDomainAsyncJob job) + ATTRIBUTE_NONNULL(1); + +static void +qemuMigrationJobFinish(virQEMUDriverPtr driver, + virDomainObjPtr obj) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); /* qemuMigrationCheckTLSCreds * @driver: pointer to qemu driver @@ -5745,7 +5776,7 @@ qemuMigrationCancel(virQEMUDriverPtr driver, } -int +static int qemuMigrationJobStart(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob job) @@ -5773,7 +5804,7 @@ qemuMigrationJobStart(virQEMUDriverPtr driver, return 0; } -void +static void qemuMigrationJobSetPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationJobPhase phase) @@ -5790,7 +5821,7 @@ qemuMigrationJobSetPhase(virQEMUDriverPtr driver, qemuDomainObjSetJobPhase(driver, vm, phase); } -void +static void qemuMigrationJobStartPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationJobPhase phase) @@ -5798,13 +5829,13 @@ qemuMigrationJobStartPhase(virQEMUDriverPtr driver, qemuMigrationJobSetPhase(driver, vm, phase); } -void +static void qemuMigrationJobContinue(virDomainObjPtr vm) { qemuDomainObjReleaseAsyncJob(vm); } -bool +static bool qemuMigrationJobIsActive(virDomainObjPtr vm, qemuDomainAsyncJob job) { @@ -5824,7 +5855,7 @@ qemuMigrationJobIsActive(virDomainObjPtr vm, return true; } -void +static void qemuMigrationJobFinish(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjEndAsyncJob(driver, vm); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 328908f6f9..234f1eb858 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -133,38 +133,6 @@ qemuMigrationParams(virTypedParameterPtr params, int nparams, unsigned long flags); -int -qemuMigrationJobStart(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob job) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; - -void -qemuMigrationJobSetPhase(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationJobPhase phase) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - -void -qemuMigrationJobStartPhase(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationJobPhase phase) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - -void -qemuMigrationJobContinue(virDomainObjPtr obj) - ATTRIBUTE_NONNULL(1); - -bool -qemuMigrationJobIsActive(virDomainObjPtr vm, - qemuDomainAsyncJob job) - ATTRIBUTE_NONNULL(1); - -void -qemuMigrationJobFinish(virQEMUDriverPtr driver, - virDomainObjPtr obj) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - int qemuMigrationSetOffline(virQEMUDriverPtr driver, virDomainObjPtr vm); -- 2.14.3