[PATCH 0/2] libxl: Remove dead code
I was too lazy to dig through history, but I think 1/2 was the result of too much copy and paste when originally implementing jobs in the libxl driver. For 2/2, I think there was some ill-conceived locking of the libxlDomainObjPrivate in the past. Its use was killed but the object remained virObjectLockable. Jim Fehlig (2): libxl: Remove unused macros libxl: Don't derive libxlDomainObjPrivate from virObjectLockable src/libxl/libxl_domain.c | 38 ++++++-------------------------------- src/libxl/libxl_domain.h | 7 ------- 2 files changed, 6 insertions(+), 39 deletions(-) -- 2.33.0
Remove unused JOB_MASK and DEFAULT_JOB_MASK macros. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- src/libxl/libxl_domain.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 1618c47ed5..8d36197faf 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -27,11 +27,6 @@ #include "virchrdev.h" #include "virenum.h" -#define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) -#define DEFAULT_JOB_MASK \ - (JOB_MASK(LIBXL_JOB_DESTROY) | \ - JOB_MASK(LIBXL_JOB_ABORT)) - /* Only 1 job is allowed at any time * A job includes *all* libxl.so api, even those just querying * information, not merely actions */ -- 2.33.0
The libxlDomainObjPrivate object is never locked and hence does not need to be a virObjectLockable object. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- src/libxl/libxl_domain.c | 38 ++++++-------------------------------- src/libxl/libxl_domain.h | 2 -- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 4f61584ceb..0d94b85a0d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -51,21 +51,6 @@ VIR_ENUM_IMPL(libxlDomainJob, "modify", ); -static virClass *libxlDomainObjPrivateClass; - -static void -libxlDomainObjPrivateDispose(void *obj); - -static int -libxlDomainObjPrivateOnceInit(void) -{ - if (!VIR_CLASS_NEW(libxlDomainObjPrivate, virClassForObjectLockable())) - return -1; - - return 0; -} - -VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate); static int libxlDomainObjInitJob(libxlDomainObjPrivate *priv) @@ -206,42 +191,31 @@ libxlDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { libxlDomainObjPrivate *priv; - if (libxlDomainObjPrivateInitialize() < 0) - return NULL; - - if (!(priv = virObjectLockableNew(libxlDomainObjPrivateClass))) - return NULL; + priv = g_new0(libxlDomainObjPrivate, 1); if (!(priv->devs = virChrdevAlloc())) { - virObjectUnref(priv); + g_free(priv); return NULL; } if (libxlDomainObjInitJob(priv) < 0) { virChrdevFree(priv->devs); - virObjectUnref(priv); + g_free(priv); return NULL; } return priv; } -static void -libxlDomainObjPrivateDispose(void *obj) -{ - libxlDomainObjPrivate *priv = obj; - - libxlDomainObjFreeJob(priv); - virChrdevFree(priv->devs); -} - static void libxlDomainObjPrivateFree(void *data) { libxlDomainObjPrivate *priv = data; g_free(priv->lockState); - virObjectUnref(priv); + libxlDomainObjFreeJob(priv); + virChrdevFree(priv->devs); + g_free(priv); } static int diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 8d36197faf..661610bd3f 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -51,8 +51,6 @@ struct libxlDomainJobObj { typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate; struct _libxlDomainObjPrivate { - virObjectLockable parent; - /* console */ virChrdevs *devs; libxl_evgen_domain_death *deathW; -- 2.33.0
On 11/24/21 00:43, Jim Fehlig wrote:
I was too lazy to dig through history, but I think 1/2 was the result of too much copy and paste when originally implementing jobs in the libxl driver. For 2/2, I think there was some ill-conceived locking of the libxlDomainObjPrivate in the past. Its use was killed but the object remained virObjectLockable.
Jim Fehlig (2): libxl: Remove unused macros libxl: Don't derive libxlDomainObjPrivate from virObjectLockable
src/libxl/libxl_domain.c | 38 ++++++-------------------------------- src/libxl/libxl_domain.h | 7 ------- 2 files changed, 6 insertions(+), 39 deletions(-)
Funny thing is that LIBXL_JOB_ABORT which is removed in 1/2 was never defined :-) Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Jim Fehlig -
Michal Prívozník