[libvirt] [PATCH 1/2] qemu: enum cleanups in "src/qemu/*"
As we are doing with the enum structures, a cleanup in "src/qemu/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/qemu/qemu_{capabilities, domain, migration, hotplug}.h". Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/qemu/qemu_capabilities.c | 8 ++++---- src/qemu/qemu_capabilities.h | 10 +++++----- src/qemu/qemu_domain.c | 28 ++++++++++++++-------------- src/qemu/qemu_domain.h | 24 ++++++++++++------------ src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_migration.c | 24 ++++++++++++------------ src/qemu/qemu_migration.h | 14 +++++++------- src/qemu/qemu_process.c | 8 ++++---- src/qemu/qemu_process.h | 4 ++-- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 08c3d04..a50ca41 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1886,7 +1886,7 @@ void virQEMUCapsDispose(void *obj) void virQEMUCapsSet(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag) + virQEMUCapsFlags flag) { ignore_value(virBitmapSetBit(qemuCaps->flags, flag)); } @@ -1907,7 +1907,7 @@ virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) void virQEMUCapsClear(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag) + virQEMUCapsFlags flag) { ignore_value(virBitmapClearBit(qemuCaps->flags, flag)); } @@ -1921,7 +1921,7 @@ char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps) bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag) + virQEMUCapsFlags flag) { bool b; @@ -2279,7 +2279,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps, struct tpmTypeToCaps { int type; - enum virQEMUCapsFlags caps; + virQEMUCapsFlags caps; }; static const struct tpmTypeToCaps virQEMUCapsTPMTypesToCaps[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d755caa..53ebe90 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -30,7 +30,7 @@ # include "qemu_monitor.h" /* Internal flags to keep track of qemu command line capabilities */ -enum virQEMUCapsFlags { +typedef enum { QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ @@ -208,7 +208,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ QEMU_CAPS_LAST, /* this must always be the last item */ -}; +} virQEMUCapsFlags; typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; @@ -231,15 +231,15 @@ int virQEMUCapsProbeQMP(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); void virQEMUCapsSet(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); + virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); void virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) ATTRIBUTE_NONNULL(1); void virQEMUCapsClear(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); + virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps, - enum virQEMUCapsFlags flag); + virQEMUCapsFlags flag); bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, virDomainDefPtr def); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e40c5ec..fcbff29 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -76,7 +76,7 @@ VIR_ENUM_IMPL(qemuDomainAsyncJob, QEMU_ASYNC_JOB_LAST, const char * -qemuDomainAsyncJobPhaseToString(enum qemuDomainAsyncJob job, +qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, int phase ATTRIBUTE_UNUSED) { switch (job) { @@ -96,7 +96,7 @@ qemuDomainAsyncJobPhaseToString(enum qemuDomainAsyncJob job, } int -qemuDomainAsyncJobPhaseFromString(enum qemuDomainAsyncJob job, +qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, const char *phase) { if (!phase) @@ -205,7 +205,7 @@ qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) } static bool -qemuDomainTrackJob(enum qemuDomainJob job) +qemuDomainTrackJob(qemuDomainJob job) { return (QEMU_DOMAIN_TRACK_JOBS & JOB_MASK(job)) != 0; } @@ -278,7 +278,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) { qemuDomainObjPrivatePtr priv = data; const char *monitorpath; - enum qemuDomainJob job; + qemuDomainJob job; /* priv->monitor_chr is set only for qemu */ if (priv->monConfig) { @@ -1033,13 +1033,13 @@ qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) } static bool -qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) +qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, qemuDomainJob job) { return !priv->job.asyncJob || (priv->job.mask & JOB_MASK(job)) != 0; } bool -qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) +qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, qemuDomainJob job) { return !priv->job.active && qemuDomainNestedJobAllowed(priv, job); } @@ -1053,8 +1053,8 @@ qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) static int ATTRIBUTE_NONNULL(1) qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainJob job, - enum qemuDomainAsyncJob asyncJob) + qemuDomainJob job, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = obj->privateData; unsigned long long now; @@ -1170,7 +1170,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, */ int qemuDomainObjBeginJob(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainJob job) + qemuDomainJob job) { if (qemuDomainObjBeginJobInternal(driver, obj, job, QEMU_ASYNC_JOB_NONE) < 0) @@ -1181,7 +1181,7 @@ int qemuDomainObjBeginJob(virQEMUDriverPtr driver, int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { if (qemuDomainObjBeginJobInternal(driver, obj, QEMU_JOB_ASYNC, asyncJob) < 0) @@ -1193,7 +1193,7 @@ int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver, static int ATTRIBUTE_RETURN_CHECK qemuDomainObjBeginNestedJob(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = obj->privateData; @@ -1226,7 +1226,7 @@ qemuDomainObjBeginNestedJob(virQEMUDriverPtr driver, bool qemuDomainObjEndJob(virQEMUDriverPtr driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; - enum qemuDomainJob job = priv->job.active; + qemuDomainJob job = priv->job.active; priv->jobs_queued--; @@ -1285,7 +1285,7 @@ qemuDomainObjAbortAsyncJob(virDomainObjPtr obj) static int qemuDomainObjEnterMonitorInternal(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = obj->privateData; @@ -1378,7 +1378,7 @@ void qemuDomainObjExitMonitor(virQEMUDriverPtr driver, int qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { return qemuDomainObjEnterMonitorInternal(driver, obj, asyncJob); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8615f74..8bf3d69 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -67,7 +67,7 @@ /* Only 1 job is allowed at any time * A job includes *all* monitor commands, even those just querying * information, not merely actions */ -enum qemuDomainJob { +typedef enum { QEMU_JOB_NONE = 0, /* Always set to 0 for easy if (jobActive) conditions */ QEMU_JOB_QUERY, /* Doesn't change any state */ QEMU_JOB_DESTROY, /* Destroys the domain (cannot be masked out) */ @@ -81,14 +81,14 @@ enum qemuDomainJob { QEMU_JOB_ASYNC_NESTED, /* Normal job within an async job */ QEMU_JOB_LAST -}; +} qemuDomainJob; VIR_ENUM_DECL(qemuDomainJob) /* Async job consists of a series of jobs that may change state. Independent * jobs that do not change state (and possibly others if explicitly allowed by * current async job) are allowed to be run even if async job is active. */ -enum qemuDomainAsyncJob { +typedef enum { QEMU_ASYNC_JOB_NONE = 0, QEMU_ASYNC_JOB_MIGRATION_OUT, QEMU_ASYNC_JOB_MIGRATION_IN, @@ -97,16 +97,16 @@ enum qemuDomainAsyncJob { QEMU_ASYNC_JOB_SNAPSHOT, QEMU_ASYNC_JOB_LAST -}; +} qemuDomainAsyncJob; VIR_ENUM_DECL(qemuDomainAsyncJob) struct qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ - enum qemuDomainJob active; /* Currently running job */ + qemuDomainJob active; /* Currently running job */ unsigned long long owner; /* Thread id which set current job */ virCond asyncCond; /* Use to coordinate with async jobs */ - enum qemuDomainAsyncJob asyncJob; /* Currently active async job */ + qemuDomainAsyncJob asyncJob; /* Currently active async job */ unsigned long long asyncOwner; /* Thread which set current async job */ int phase; /* Job phase (mainly for migrations) */ unsigned long long mask; /* Jobs allowed during async job */ @@ -193,9 +193,9 @@ struct qemuProcessEvent { void *data; }; -const char *qemuDomainAsyncJobPhaseToString(enum qemuDomainAsyncJob job, +const char *qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, int phase); -int qemuDomainAsyncJobPhaseFromString(enum qemuDomainAsyncJob job, +int qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, const char *phase); void qemuDomainEventFlush(int timer, void *opaque); @@ -205,11 +205,11 @@ void qemuDomainEventQueue(virQEMUDriverPtr driver, int qemuDomainObjBeginJob(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainJob job) + qemuDomainJob job) ATTRIBUTE_RETURN_CHECK; int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) ATTRIBUTE_RETURN_CHECK; bool qemuDomainObjEndJob(virQEMUDriverPtr driver, @@ -239,7 +239,7 @@ void qemuDomainObjExitMonitor(virQEMUDriverPtr driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver, virDomainObjPtr obj, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -344,7 +344,7 @@ void qemuDomainSetFakeReboot(virQEMUDriverPtr driver, bool value); bool qemuDomainJobAllowed(qemuDomainObjPrivatePtr priv, - enum qemuDomainJob job); + qemuDomainJob job); int qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bf2020..6b363ed 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2908,7 +2908,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, int compressed, bool was_running, unsigned int flags, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { virQEMUSaveHeader header; bool bypassSecurityDriver = false; @@ -3387,7 +3387,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) } static int qemuDumpToFd(virQEMUDriverPtr driver, virDomainObjPtr vm, - int fd, enum qemuDomainAsyncJob asyncJob, + int fd, qemuDomainAsyncJob asyncJob, const char *dumpformat) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -12839,7 +12839,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, virDomainDiskDefPtr persistDisk, virJSONValuePtr actions, bool reuse, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; char *device = NULL; @@ -13076,7 +13076,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainSnapshotObjPtr snap, unsigned int flags, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; virJSONValuePtr actions = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7289055..ed86520 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -195,7 +195,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; virHashTablePtr table = NULL; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 9ed630a..beaa332 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -35,7 +35,7 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, bool force); int qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob asyncJob); + qemuDomainAsyncJob asyncJob); int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainControllerDefPtr controller); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 842f782..7684aec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1585,7 +1585,7 @@ qemuMigrationSetOffline(virQEMUDriverPtr driver, static int qemuMigrationSetCompression(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; @@ -1625,7 +1625,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver, static int qemuMigrationSetAutoConverge(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; @@ -1704,7 +1704,7 @@ static int qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *job, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; @@ -1788,7 +1788,7 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, */ static int qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob asyncJob, + qemuDomainAsyncJob asyncJob, virConnectPtr dconn, bool abort_on_error) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2006,7 +2006,7 @@ qemuMigrationCleanup(virDomainObjPtr vm, " was closed; canceling the migration", vm->def->name); - switch ((enum qemuMigrationJobPhase) priv->job.phase) { + switch ((qemuMigrationJobPhase) priv->job.phase) { case QEMU_MIGRATION_PHASE_BEGIN3: /* just forget we were about to migrate */ qemuDomainObjDiscardAsyncJob(driver, vm); @@ -2154,7 +2154,7 @@ qemuMigrationBegin(virConnectPtr conn, { virQEMUDriverPtr driver = conn->privateData; char *xml = NULL; - enum qemuDomainAsyncJob asyncJob; + qemuDomainAsyncJob asyncJob; if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) @@ -2892,7 +2892,7 @@ qemuMigrationConfirm(virConnectPtr conn, int cancelled) { virQEMUDriverPtr driver = conn->privateData; - enum qemuMigrationJobPhase phase; + qemuMigrationJobPhase phase; virQEMUDriverConfigPtr cfg = NULL; int ret = -1; @@ -4694,7 +4694,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int fd, off_t offset, const char *path, const char *compressor, bool bypassSecurityDriver, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; int rc; @@ -4865,7 +4865,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int qemuMigrationJobStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -4888,7 +4888,7 @@ qemuMigrationJobStart(virQEMUDriverPtr driver, void qemuMigrationJobSetPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuMigrationJobPhase phase) + qemuMigrationJobPhase phase) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -4905,7 +4905,7 @@ qemuMigrationJobSetPhase(virQEMUDriverPtr driver, void qemuMigrationJobStartPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuMigrationJobPhase phase) + qemuMigrationJobPhase phase) { virObjectRef(vm); qemuMigrationJobSetPhase(driver, vm, phase); @@ -4920,7 +4920,7 @@ qemuMigrationJobContinue(virDomainObjPtr vm) bool qemuMigrationJobIsActive(virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) { qemuDomainObjPrivatePtr priv = vm->privateData; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index a802fb7..3fa68dc 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -53,7 +53,7 @@ NULL -enum qemuMigrationJobPhase { +typedef enum { QEMU_MIGRATION_PHASE_NONE = 0, QEMU_MIGRATION_PHASE_PERFORM2, QEMU_MIGRATION_PHASE_BEGIN3, @@ -66,25 +66,25 @@ enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_FINISH3, QEMU_MIGRATION_PHASE_LAST -}; +} qemuMigrationJobPhase; VIR_ENUM_DECL(qemuMigrationJobPhase) int qemuMigrationJobStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; void qemuMigrationJobSetPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuMigrationJobPhase phase) + qemuMigrationJobPhase phase) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuMigrationJobStartPhase(virQEMUDriverPtr driver, virDomainObjPtr vm, - enum qemuMigrationJobPhase phase) + qemuMigrationJobPhase phase) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); bool qemuMigrationJobContinue(virDomainObjPtr obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; bool qemuMigrationJobIsActive(virDomainObjPtr vm, - enum qemuDomainAsyncJob job) + qemuDomainAsyncJob job) ATTRIBUTE_NONNULL(1); bool qemuMigrationJobFinish(virQEMUDriverPtr driver, virDomainObjPtr obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -172,7 +172,7 @@ int qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int fd, off_t offset, const char *path, const char *compressor, bool bypassSecurityDriver, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e4845ba..6960cb8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2762,7 +2762,7 @@ qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, int qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, virConnectPtr conn, virDomainRunningReason reason, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2804,7 +2804,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, int qemuProcessStopCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainPausedReason reason, - enum qemuDomainAsyncJob asyncJob) + qemuDomainAsyncJob asyncJob) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2928,8 +2928,8 @@ static int qemuProcessRecoverMigration(virQEMUDriverPtr driver, virDomainObjPtr vm, virConnectPtr conn, - enum qemuDomainAsyncJob job, - enum qemuMigrationJobPhase phase, + qemuDomainAsyncJob job, + qemuMigrationJobPhase phase, virDomainState state, int reason) { diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index d99978f..9c78736 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -33,11 +33,11 @@ int qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, virConnectPtr conn, virDomainRunningReason reason, - enum qemuDomainAsyncJob asyncJob); + qemuDomainAsyncJob asyncJob); int qemuProcessStopCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainPausedReason reason, - enum qemuDomainAsyncJob asyncJob); + qemuDomainAsyncJob asyncJob); void qemuProcessAutostartAll(virQEMUDriverPtr driver); void qemuProcessReconnectAll(virConnectPtr conn, virQEMUDriverPtr driver); -- 1.7.10.4
As we are doing with the enum structures, a cleanup in "src/nwfilter/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/nwfilter/nwfilter_{gentech_driver, learnipaddr, tech_driver}.h". Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/nwfilter/nwfilter_gentech_driver.c | 12 ++++++------ src/nwfilter/nwfilter_gentech_driver.h | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/nwfilter/nwfilter_learnipaddr.h | 8 ++++---- src/nwfilter/nwfilter_tech_driver.h | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 5bed106..5a4c896 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -332,7 +332,7 @@ static int virNWFilterDefToInst(virNWFilterDriverStatePtr driver, virNWFilterDefPtr def, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + instCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst); @@ -374,7 +374,7 @@ static int virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver, virNWFilterIncludeDefPtr inc, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + instCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst) { @@ -464,7 +464,7 @@ static int virNWFilterDefToInst(virNWFilterDriverStatePtr driver, virNWFilterDefPtr def, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + instCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst) { @@ -630,7 +630,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, int ifindex, const char *linkdev, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, bool *foundNewFilter, + instCase useNewFilter, bool *foundNewFilter, bool teardownOld, const virMacAddr *macaddr, virNWFilterDriverStatePtr driver, @@ -782,7 +782,7 @@ __virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, const virMacAddr *macaddr, const char *filtername, virNWFilterHashTablePtr filterparams, - enum instCase useNewFilter, + instCase useNewFilter, bool forceWithPendingReq, bool *foundNewFilter) { @@ -896,7 +896,7 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, const unsigned char *vmuuid, const virDomainNetDef *net, bool teardownOld, - enum instCase useNewFilter, + instCase useNewFilter, bool *foundNewFilter) { const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 8349ab4..90db084 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -32,10 +32,10 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); -enum instCase { +typedef enum { INSTANTIATE_ALWAYS, INSTANTIATE_FOLLOW_NEWFILTER, -}; +} instCase; int virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 4cea9cf..05bebbb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -771,7 +771,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, const char *filtername ATTRIBUTE_UNUSED, virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED, - enum howDetect howDetect ATTRIBUTE_UNUSED) + howDetect howdetect ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IP parameter must be given since libvirt " diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h index 1cc881a..9d7960b 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -30,10 +30,10 @@ # include "nwfilter_tech_driver.h" # include <net/if.h> -enum howDetect { +typedef enum { DETECT_DHCP = 1, DETECT_STATIC = 2, -}; +} howDetect; typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; @@ -46,7 +46,7 @@ struct _virNWFilterIPAddrLearnReq { char *filtername; virNWFilterHashTablePtr filterparams; virNWFilterDriverStatePtr driver; - enum howDetect howDetect; + howDetect howDetect; int status; pthread_t thread; @@ -61,7 +61,7 @@ int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *filtername, virNWFilterHashTablePtr filterparams, virNWFilterDriverStatePtr driver, - enum howDetect howDetect); + howDetect howDetect); virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); int virNWFilterTerminateLearnReq(const char *ifname); diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h index 7b6f56f..05d2561 100644 --- a/src/nwfilter/nwfilter_tech_driver.h +++ b/src/nwfilter/nwfilter_tech_driver.h @@ -70,13 +70,13 @@ typedef int (*virNWFilterRemoveBasicRules)(const char *ifname); typedef int (*virNWFilterDropAllRules)(const char *ifname); -enum techDrvFlags { +typedef enum { TECHDRV_FLAG_INITIALIZED = (1 << 0), -}; +} techDrvFlags; struct _virNWFilterTechDriver { const char *name; - enum techDrvFlags flags; + techDrvFlags flags; virNWFilterTechDrvInit init; virNWFilterTechDrvShutdown shutdown; -- 1.7.10.4
ping...
On 06/15/2014 10:32 AM, Julio Faracco wrote:
As we are doing with the enum structures, a cleanup in "src/nwfilter/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/nwfilter/nwfilter_{gentech_driver, learnipaddr, tech_driver}.h".
Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/nwfilter/nwfilter_gentech_driver.c | 12 ++++++------ src/nwfilter/nwfilter_gentech_driver.h | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/nwfilter/nwfilter_learnipaddr.h | 8 ++++---- src/nwfilter/nwfilter_tech_driver.h | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 5bed106..5a4c896 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -332,7 +332,7 @@ static int virNWFilterDefToInst(virNWFilterDriverStatePtr driver, virNWFilterDefPtr def, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + instCase useNewFilter,
It would be nice to do a followup patch that renames instCase into something like virInstCase, to make it obvious that it is an enum type provided by libvirt...
+++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -32,10 +32,10 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void);
-enum instCase { +typedef enum { INSTANTIATE_ALWAYS, INSTANTIATE_FOLLOW_NEWFILTER, -}; +} instCase;
...the current naming is too prone to collision with other library's include files.
int virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 4cea9cf..05bebbb 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -771,7 +771,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, const char *filtername ATTRIBUTE_UNUSED, virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED, - enum howDetect howDetect ATTRIBUTE_UNUSED) + howDetect howdetect ATTRIBUTE_UNUSED)
Same story for howDetect.
-enum techDrvFlags { +typedef enum { TECHDRV_FLAG_INITIALIZED = (1 << 0), -}; +} techDrvFlags;
Also this enum. At any rate, your patch is a strict improvement, so ACK and pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 06/24/2014 01:02 PM, Eric Blake wrote:
On 06/15/2014 10:32 AM, Julio Faracco wrote:
As we are doing with the enum structures, a cleanup in "src/nwfilter/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/nwfilter/nwfilter_{gentech_driver, learnipaddr, tech_driver}.h".
Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/nwfilter/nwfilter_gentech_driver.c | 12 ++++++------ src/nwfilter/nwfilter_gentech_driver.h | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/nwfilter/nwfilter_learnipaddr.h | 8 ++++---- src/nwfilter/nwfilter_tech_driver.h | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-)
-enum techDrvFlags { +typedef enum { TECHDRV_FLAG_INITIALIZED = (1 << 0), -}; +} techDrvFlags;
Also this enum.
At any rate, your patch is a strict improvement, so ACK and pushed.
I spoke too soon. Your patch failed to build: CC nwfilter/libvirt_driver_nwfilter_impl_la-nwfilter_learnipaddr.lo nwfilter/nwfilter_learnipaddr.c:329:19: error: 'enum howDetect' declared inside parameter list [-Werror] enum howDetect *howDetected) ^ nwfilter/nwfilter_learnipaddr.c:329:19: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] nwfilter/nwfilter_learnipaddr.c: In function 'procDHCPOpts': nwfilter/nwfilter_learnipaddr.c:353:21: error: dereferencing pointer to incomplete type *howDetected = DETECT_DHCP; ^ nwfilter/nwfilter_learnipaddr.c: In function 'learnIPAddressThread': nwfilter/nwfilter_learnipaddr.c:398:10: error: variable 'howDetected' has initializer but incomplete type enum howDetect howDetected = 0; ^ Please respin the patch, and when posting v2, it would be nice to include the renames into the right namespace prefix. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 06/15/2014 10:32 AM, Julio Faracco wrote:
As we are doing with the enum structures, a cleanup in "src/qemu/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/qemu/qemu_{capabilities, domain, migration, hotplug}.h".
Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- src/qemu/qemu_capabilities.c | 8 ++++---- src/qemu/qemu_capabilities.h | 10 +++++----- src/qemu/qemu_domain.c | 28 ++++++++++++++-------------- src/qemu/qemu_domain.h | 24 ++++++++++++------------ src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_migration.c | 24 ++++++++++++------------ src/qemu/qemu_migration.h | 14 +++++++------- src/qemu/qemu_process.c | 8 ++++---- src/qemu/qemu_process.h | 4 ++-- 11 files changed, 66 insertions(+), 66 deletions(-)
ACK and pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Julio Faracco