提交 6728645a 编写于 作者: J Jim Fehlig

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: NJim Fehlig <jfehlig@suse.com>
上级 1cca1d25
...@@ -853,8 +853,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) ...@@ -853,8 +853,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
return ret; return ret;
} }
int static int
libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config)
{ {
uint32_t needed_mem; uint32_t needed_mem;
uint32_t free_mem; uint32_t free_mem;
...@@ -863,10 +863,10 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) ...@@ -863,10 +863,10 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config)
int tries = 3; int tries = 3;
int wait_secs = 10; 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) { &needed_mem)) >= 0) {
for (i = 0; i < tries; ++i) { 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; break;
if (free_mem >= needed_mem) { if (free_mem >= needed_mem) {
...@@ -874,17 +874,17 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) ...@@ -874,17 +874,17 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config)
break; break;
} }
if ((ret = libxl_set_memory_target(priv->ctx, 0, if ((ret = libxl_set_memory_target(ctx, 0,
free_mem - needed_mem, free_mem - needed_mem,
/* relative */ 1, 0)) < 0) /* relative */ 1, 0)) < 0)
break; break;
ret = libxl_wait_for_free_memory(priv->ctx, 0, needed_mem, ret = libxl_wait_for_free_memory(ctx, 0, needed_mem,
wait_secs); wait_secs);
if (ret == 0 || ret != ERROR_NOMEM) if (ret == 0 || ret != ERROR_NOMEM)
break; 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; break;
} }
} }
...@@ -1008,7 +1008,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ...@@ -1008,7 +1008,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
priv->ctx, &d_config) < 0) priv->ctx, &d_config) < 0)
goto endjob; goto endjob;
if (cfg->autoballoon && libxlDomainFreeMem(priv, &d_config) < 0) { if (cfg->autoballoon && libxlDomainFreeMem(priv->ctx, &d_config) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight failed to get free memory for domain '%s'"), _("libxenlight failed to get free memory for domain '%s'"),
d_config.c_info.name); d_config.c_info.name);
......
...@@ -140,10 +140,6 @@ int ...@@ -140,10 +140,6 @@ int
libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver,
virDomainObjPtr vm); virDomainObjPtr vm);
int
libxlDomainFreeMem(libxlDomainObjPrivatePtr priv,
libxl_domain_config *d_config);
int int
libxlDomainStart(libxlDriverPrivatePtr driver, libxlDomainStart(libxlDriverPrivatePtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册