External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: make libxlDomainFreeMem static

Browse Source 
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 <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-02-11 14:47:42 -07:00
parent 1cca1d25a0
commit 6728645a41
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libxl/libxl_domain.c
View File

@ -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);

4
src/libxl/libxl_domain.h
View File

@ -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,