7:08 a.m.
* include/libvirt/libvirt.h.in: (Add macros for the param fields,
declare the APIs).
* src/driver.h: (New methods for the driver struct)
* src/libvirt.c: (Implement the public APIs)
* src/libvirt_public.syms: (Export the public symbols)
---
include/libvirt/libvirt.h.in | 63 ++++++++++++++++++++++
python/generator.py | 2 +
src/driver.h | 14 +++++
src/libvirt.c | 121 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 2 +
5 files changed, 202 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index f63178c..5d8e6f4 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -4272,6 +4272,69 @@ typedef struct _virTypedParameter virMemoryParameter;
*/
typedef virMemoryParameter *virMemoryParameterPtr;
+/*
+ * VIR_NODE_KSM_PAGES_TO_SCAN:
+ *
+ * Macro for typed parameter that represents how many present pages
+ * to scan before ksmd goes to sleep.
+ */
+# define VIR_NODE_SHARED_MEMORY_PAGES_TO_SCAN "pages_to_scan"
+
+/*
+ * VIR_NODE_KSM_SLEEP_MILLISECS:
+ *
+ * Macro for typed parameter that represents how many milliseconds
+ * ksmd should sleep before next scan.
+ */
+# define VIR_NODE_SHARED_MEMORY_SLEEP_MILLISECS "sleep_millisecs"
+
+/*
+ * VIR_NODE_KSM_PAGES_SHARED:
+ *
+ * Macro for typed parameter that represents how many ksm shared pages
+ * are being used.
+ */
+# define VIR_NODE_SHARED_MEMORY_PAGES_SHARED "pages_shared"
+
+/*
+ * VIR_NODE_KSM_PAGES_SHARING:
+ *
+ * Macro for typed parameter that represents how many sites are
+ * sharing the pages i.e. how much saved.
+ */
+# define VIR_NODE_SHARED_MEMORY_PAGES_SHARING "pages_sharing"
+
+/* VIR_NODE_KSM_PAGES_UNSHARED:
+ *
+ * Macro for typed parameter that represents how many pages unique
+ * but repeatedly checked for merging.
+ */
+# define VIR_NODE_SHARED_MEMORY_PAGES_UNSHARED "pages_unshared"
+
+/* VIR_NODE_KSM_PAGES_VOLATILE:
+ *
+ * Macro for typed parameter that represents how many pages changing
+ * too fast to be placed in a tree.
+ */
+# define VIR_NODE_SHARED_MEMORY_PAGES_VOLATILE "pages_volatile"
+
+/* VIR_NODE_KSM_FULL_SCAN:
+ *
+ * Macro for typed parameter that represents how many times all
+ * mergeable areas have been scanned.
+ */
+# define VIR_NODE_SHARED_MEMORY_FULL_SCANS "full_scans"
+
+int virNodeGetSharedMemoryParameters(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags);
+
+int virNodeSetSharedMemoryParameters(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int nparams,
+ unsigned int flags);
+
#ifdef __cplusplus
}
#endif
diff --git a/python/generator.py b/python/generator.py
index 276b4ff..e963a6b 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -427,6 +427,8 @@ skip_impl = (
'virDomainGetDiskErrors',
'virConnectUnregisterCloseCallback',
'virConnectRegisterCloseCallback',
+ 'virNodeGetSharedMemoryParameters',
+ 'virNodeSetSharedMemoryParameters',
)
qemu_skip_impl = (
diff --git a/src/driver.h b/src/driver.h
index 1bdfd29..d758f2e 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -882,6 +882,18 @@ typedef char *
const char *uri,
unsigned int flags);
+typedef int
+ (*virDrvNodeGetSharedMemoryParameters)(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags);
+
+typedef int
+ (*virDrvNodeSetSharedMemoryParameters)(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int nparams,
+ unsigned int flags);
+
/**
* _virDriver:
*
@@ -1068,6 +1080,8 @@ struct _virDriver {
virDrvDomainGetDiskErrors domainGetDiskErrors;
virDrvDomainSetMetadata domainSetMetadata;
virDrvDomainGetMetadata domainGetMetadata;
+ virDrvNodeGetSharedMemoryParameters nodeGetSharedMemoryParameters;
+ virDrvNodeSetSharedMemoryParameters nodeSetSharedMemoryParameters;
};
typedef int
diff --git a/src/libvirt.c b/src/libvirt.c
index 3de6b13..0f60de3 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -6717,6 +6717,127 @@ error:
return -1;
}
+/*
+ * virNodeGetSharedMemoryParameters:
+ * @conn: pointer to the hypervisor connection
+ * @params: pointer to memory parameter object
+ * (return value, allocated by the caller)
+ * @nparams: pointer to number of memory parameters; input and output
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Get all node shared memory parameters. On input, @nparams gives the
+ * size of the @params array; on output, @nparams gives how many slots
+ * were filled with parameter information, which might be less but will
+ * not exceed the input value.
+ *
+ * As a special case, calling with @params as NULL and @nparams as 0 on
+ * input will cause @nparams on output to contain the number of parameters
+ * supported by the hypervisor. The caller should then allocate @params
+ * array, i.e. (sizeof(@virTypedParameter) * @nparams) bytes and call the API
+ * again. See virDomainGetMemoryParameters() for an equivalent usage
+ * example.
+ *
+ * Returns 0 in case of success, and -1 in case of failure.
+ */
+int
+virNodeGetSharedMemoryParameters(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
+{
+ VIR_DEBUG("conn=%p, params=%p, nparams=%p, flags=%x",
+ conn, params, nparams, flags);
+
+ virResetLastError();
+
+ if (!VIR_IS_CONNECT(conn)) {
+ virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+
+ virCheckNonNullArgGoto(nparams, error);
+ virCheckNonNegativeArgGoto(*nparams, error);
+ if (*nparams != 0)
+ virCheckNonNullArgGoto(params, error);
+
+ if (VIR_DRV_SUPPORTS_FEATURE(conn->driver, conn,
+ VIR_DRV_FEATURE_TYPED_PARAM_STRING))
+ flags |= VIR_TYPED_PARAM_STRING_OKAY;
+
+ if (conn->driver->nodeGetSharedMemoryParameters) {
+ int ret;
+ ret = conn->driver->nodeGetSharedMemoryParameters(conn, params,
+ nparams, flags);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(conn);
+ return -1;
+}
+
+/*
+ * virNodeSetSharedMemoryParameters:
+ * @conn: pointer to the hypervisor connection
+ * @params: pointer to scheduler parameter objects
+ * @nparams: number of scheduler parameter objects
+ * (this value can be the same or less than the returned
+ * value nparams of virDomainGetSchedulerType)
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Change all or a subset of the shared memory tunables.
+ * This function may require privileged access to the hypervisor.
+ *
+ * Returns 0 in case of success, -1 in case of failure.
+ */
+int
+virNodeSetSharedMemoryParameters(virConnectPtr conn,
+ virTypedParameterPtr params,
+ int nparams,
+ unsigned int flags)
+{
+ VIR_DEBUG("conn=%p, params=%p, nparams=%d, flags=%x",
+ conn, params, nparams, flags);
+
+ virResetLastError();
+
+ if (!VIR_IS_CONNECT(conn)) {
+ virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+
+ if (conn->flags & VIR_CONNECT_RO) {
+ virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ goto error;
+ }
+
+ virCheckNonNullArgGoto(params, error);
+ virCheckNonNegativeArgGoto(nparams, error);
+
+ if (virTypedParameterValidateSet(conn, params, nparams) < 0)
+ goto error;
+
+ if (conn->driver->nodeSetSharedMemoryParameters) {
+ int ret;
+ ret = conn->driver->nodeSetSharedMemoryParameters(conn, params,
+ nparams, flags);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(conn);
+ return -1;
+}
/**
* virDomainGetSchedulerType:
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 53db37f..655d3fc 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -557,6 +557,8 @@ LIBVIRT_0.10.0 {
LIBVIRT_0.10.2 {
global:
virConnectListAllStoragePools;
+ virNodeGetSharedMemoryParameters;
+ virNodeSetSharedMemoryParameters;
virStoragePoolListAllVolumes;
} LIBVIRT_0.10.0;
--
1.7.7.3