xen-project/xen
1
0 Fork 1
mirror of https://github.com/xen-project/xen.git synced 2026-10-29 18:50:05 +01:00
Code Issues Activity

libxl: carve out tmem specific functions from libxl.c

Browse Source 
libxl.c has grown to an uncomfortable size. Carve out the tmem
related functions to libxl_tmem.c.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Juergen Gross authored and Wei Liu committed 2017-02-13 10:59:19 +00:00
1 parent 0529961c57
commit f2e7a0d2f1
3 files changed
+168 -143
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/libxl/Makefile
+1 -1
View File
@@ -137,7 +137,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \
libxl_qmp.o libxl_event.o libxl_fork.o \
libxl_dom_suspend.o libxl_dom_save.o libxl_usb.o \
libxl_vtpm.o libxl_nic.o libxl_disk.o libxl_console.o \
libxl_cpupool.o libxl_mem.o libxl_sched.o \
libxl_cpupool.o libxl_mem.o libxl_sched.o libxl_tmem.o \
$(LIBXL_OBJS-y)
LIBXL_OBJS += libxl_genid.o
LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o
tools/libxl/libxl.c
-142
View File
@@ -2105,148 +2105,6 @@ uint32_t libxl_vm_get_start_time(libxl_ctx *ctx, uint32_t domid)
return ret;
}
char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long)
{
int r;
char _buf[32768];
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768,
use_long, _buf);
if (r < 0) {
LOGED(ERROR, domid, "Can not get tmem list");
GC_FREE;
return NULL;
}
GC_FREE;
return strdup(_buf);
}
int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0,
NULL);
if (r < 0) {
LOGED(ERROR, domid, "Can not freeze tmem pools");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0,
NULL);
if (r < 0) {
LOGED(ERROR, domid, "Can not thaw tmem pools");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
static int32_t tmem_setop_from_string(char *set_name, uint32_t val,
xen_tmem_client_t *info)
{
if (!strcmp(set_name, "weight"))
info->weight = val;
else if (!strcmp(set_name, "compress"))
info->flags.u.compress = val;
else
return -1;
return 0;
}
int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set)
{
int r, rc;
xen_tmem_client_t info;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1 /* pool_id */,
XEN_SYSCTL_TMEM_OP_GET_CLIENT_INFO,
domid, sizeof(info), 0 /* arg */, &info);
if (r < 0) {
LOGED(ERROR, domid, "Can not get tmem data!");
rc = ERROR_FAIL;
goto out;
}
rc = tmem_setop_from_string(name, set, &info);
if (rc == -1) {
LOGEVD(ERROR, -1, domid, "Invalid set, valid sets are <weight|compress>");
rc = ERROR_INVAL;
goto out;
}
r = xc_tmem_control(ctx->xch, -1 /* pool_id */,
XEN_SYSCTL_TMEM_OP_SET_CLIENT_INFO,
domid, sizeof(info), 0 /* arg */, &info);
if (r < 0) {
LOGED(ERROR, domid, "Can not set tmem %s", name);
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_shared_auth(libxl_ctx *ctx, uint32_t domid,
char* uuid, int auth)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_auth(ctx->xch, domid, uuid, auth);
if (r < 0) {
LOGED(ERROR, domid, "Can not set tmem shared auth");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_freeable(libxl_ctx *ctx)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB,
-1, 0, 0, 0);
if (r < 0) {
LOGE(ERROR, "Can not get tmem freeable memory");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
static int fd_set_flags(libxl_ctx *ctx, int fd,
int fcntlgetop, int fcntlsetop, const char *fl,
int flagmask, int set_p)
tools/libxl/libxl_tmem.c
+167
View File
@@ -0,0 +1,167 @@
/*
* Copyright 2009-2017 Citrix Ltd and other contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; version 2.1 only. with the special
* exception on linking described in file LICENSE.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*/
#include "libxl_osdeps.h"
#include "libxl_internal.h"
char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long)
{
int r;
char _buf[32768];
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768,
use_long, _buf);
if (r < 0) {
LOGED(ERROR, domid, "Can not get tmem list");
GC_FREE;
return NULL;
}
GC_FREE;
return strdup(_buf);
}
int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0,
NULL);
if (r < 0) {
LOGED(ERROR, domid, "Can not freeze tmem pools");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0,
NULL);
if (r < 0) {
LOGED(ERROR, domid, "Can not thaw tmem pools");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
static int32_t tmem_setop_from_string(char *set_name, uint32_t val,
xen_tmem_client_t *info)
{
if (!strcmp(set_name, "weight"))
info->weight = val;
else if (!strcmp(set_name, "compress"))
info->flags.u.compress = val;
else
return -1;
return 0;
}
int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set)
{
int r, rc;
xen_tmem_client_t info;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1 /* pool_id */,
XEN_SYSCTL_TMEM_OP_GET_CLIENT_INFO,
domid, sizeof(info), 0 /* arg */, &info);
if (r < 0) {
LOGED(ERROR, domid, "Can not get tmem data!");
rc = ERROR_FAIL;
goto out;
}
rc = tmem_setop_from_string(name, set, &info);
if (rc == -1) {
LOGEVD(ERROR, -1, domid, "Invalid set, valid sets are <weight|compress>");
rc = ERROR_INVAL;
goto out;
}
r = xc_tmem_control(ctx->xch, -1 /* pool_id */,
XEN_SYSCTL_TMEM_OP_SET_CLIENT_INFO,
domid, sizeof(info), 0 /* arg */, &info);
if (r < 0) {
LOGED(ERROR, domid, "Can not set tmem %s", name);
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_shared_auth(libxl_ctx *ctx, uint32_t domid,
char* uuid, int auth)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_auth(ctx->xch, domid, uuid, auth);
if (r < 0) {
LOGED(ERROR, domid, "Can not set tmem shared auth");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
int libxl_tmem_freeable(libxl_ctx *ctx)
{
int r, rc;
GC_INIT(ctx);
r = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB,
-1, 0, 0, 0);
if (r < 0) {
LOGE(ERROR, "Can not get tmem freeable memory");
rc = ERROR_FAIL;
goto out;
}
rc = 0;
out:
GC_FREE;
return rc;
}
/*
* Local variables:
* mode: C
* c-basic-offset: 4
* indent-tabs-mode: nil
* End:
*/
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.