From 6728645a41b714488c1aa541f03883b0693899d1 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Wed, 11 Feb 2015 14:47:42 -0700 Subject: [PATCH] libxl: make libxlDomainFreeMem static libxlDomainFreeMem() is only used in libxl_domain.c and thus should be declared static. While at it, change the signature to take a libxl_ctx instead of libxlDomainObjPrivatePtr, since only the libxl_ctx is needed. Signed-off-by: Jim Fehlig --- src/libxl/libxl_domain.c | 16 ++++++++-------- src/libxl/libxl_domain.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 63c94e0f5c..333d7a4cda 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -853,8 +853,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) return ret; } -int -libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) +static int +libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) { uint32_t needed_mem; uint32_t free_mem; @@ -863,10 +863,10 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) int tries = 3; int wait_secs = 10; - if ((ret = libxl_domain_need_memory(priv->ctx, &d_config->b_info, + if ((ret = libxl_domain_need_memory(ctx, &d_config->b_info, &needed_mem)) >= 0) { for (i = 0; i < tries; ++i) { - if ((ret = libxl_get_free_memory(priv->ctx, &free_mem)) < 0) + if ((ret = libxl_get_free_memory(ctx, &free_mem)) < 0) break; if (free_mem >= needed_mem) { @@ -874,17 +874,17 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) break; } - if ((ret = libxl_set_memory_target(priv->ctx, 0, + if ((ret = libxl_set_memory_target(ctx, 0, free_mem - needed_mem, /* relative */ 1, 0)) < 0) break; - ret = libxl_wait_for_free_memory(priv->ctx, 0, needed_mem, + ret = libxl_wait_for_free_memory(ctx, 0, needed_mem, wait_secs); if (ret == 0 || ret != ERROR_NOMEM) break; - if ((ret = libxl_wait_for_memory_target(priv->ctx, 0, 1)) < 0) + if ((ret = libxl_wait_for_memory_target(ctx, 0, 1)) < 0) break; } } @@ -1008,7 +1008,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, priv->ctx, &d_config) < 0) goto endjob; - if (cfg->autoballoon && libxlDomainFreeMem(priv, &d_config) < 0) { + if (cfg->autoballoon && libxlDomainFreeMem(priv->ctx, &d_config) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to get free memory for domain '%s'"), d_config.c_info.name); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 297dffbbf3..2db4d77730 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -140,10 +140,6 @@ int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm); -int -libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, - libxl_domain_config *d_config); - int libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, -- GitLab