1:17 a.m.
Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com>
---
src/remote/remote_driver.c | 102 ++++++++++++++++++++++++++++++++++++++++++
src/remote/remote_protocol.x | 24 +++++++++-
src/remote_protocol-structs | 24 ++++++++++
3 files changed, 149 insertions(+), 1 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index af46384..884d4a4 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1743,6 +1743,106 @@ done:
}
static int
+remoteDomainPinHypervisorFlags (virDomainPtr dom,
+ unsigned char *cpumap,
+ int cpumaplen,
+ unsigned int flags)
+{
+ int rv = -1;
+ struct private_data *priv = dom->conn->privateData;
+ remote_domain_pin_hypervisor_flags_args args;
+
+ remoteDriverLock(priv);
+
+ if (cpumaplen > REMOTE_CPUMAP_MAX) {
+ remoteError(VIR_ERR_RPC,
+ _("%s length greater than maximum: %d > %d"),
+ "cpumap", (int)cpumaplen, REMOTE_CPUMAP_MAX);
+ goto done;
+ }
+
+ make_nonnull_domain(&args.dom, dom);
+ args.vcpu = -1;
+ args.cpumap.cpumap_val = (char *)cpumap;
+ args.cpumap.cpumap_len = cpumaplen;
+ args.flags = flags;
+
+ if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_PIN_HYPERVISOR_FLAGS,
+ (xdrproc_t) xdr_remote_domain_pin_hypervisor_flags_args,
+ (char *) &args,
+ (xdrproc_t) xdr_void, (char *) NULL) == -1) {
+ goto done;
+ }
+
+ rv = 0;
+
+done:
+ remoteDriverUnlock(priv);
+ return rv;
+}
+
+
+static int
+remoteDomainGetHypervisorPinInfo (virDomainPtr domain,
+ unsigned char *cpumaps,
+ int maplen,
+ unsigned int flags)
+{
+ int rv = -1;
+ int i;
+ remote_domain_get_hypervisor_pin_info_args args;
+ remote_domain_get_hypervisor_pin_info_ret ret;
+ struct private_data *priv = domain->conn->privateData;
+
+ remoteDriverLock(priv);
+
+ /* There is only one cpumap for all hypervisor threads */
+ if (INT_MULTIPLY_OVERFLOW(1, maplen) ||
+ maplen > REMOTE_CPUMAPS_MAX) {
+ remoteError(VIR_ERR_RPC,
+ _("vCPU map buffer length exceeds maximum: %d > %d"),
+ maplen, REMOTE_CPUMAPS_MAX);
+ goto done;
+ }
+
+ make_nonnull_domain(&args.dom, domain);
+ args.ncpumaps = 1;
+ args.maplen = maplen;
+ args.flags = flags;
+
+ memset(&ret, 0, sizeof ret);
+
+ if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_HYPERVISOR_PIN_INFO,
+ (xdrproc_t) xdr_remote_domain_get_hypervisor_pin_info_args,
+ (char *) &args,
+ (xdrproc_t) xdr_remote_domain_get_hypervisor_pin_info_ret,
+ (char *) &ret) == -1)
+ goto done;
+
+ if (ret.cpumaps.cpumaps_len > maplen) {
+ remoteError(VIR_ERR_RPC,
+ _("host reports map buffer length exceeds maximum: %d >
%d"),
+ ret.cpumaps.cpumaps_len, maplen);
+ goto cleanup;
+ }
+
+ memset(cpumaps, 0, maplen);
+
+ for (i = 0; i < ret.cpumaps.cpumaps_len; ++i)
+ cpumaps[i] = ret.cpumaps.cpumaps_val[i];
+
+ rv = ret.num;
+
+cleanup:
+ xdr_free ((xdrproc_t) xdr_remote_domain_get_hypervisor_pin_info_ret,
+ (char *) &ret);
+
+done:
+ remoteDriverUnlock(priv);
+ return rv;
+}
+
+static int
remoteDomainGetVcpus (virDomainPtr domain,
virVcpuInfoPtr info,
int maxinfo,
@@ -4998,6 +5098,8 @@ static virDriver remote_driver = {
.domainPinVcpu = remoteDomainPinVcpu, /* 0.3.0 */
.domainPinVcpuFlags = remoteDomainPinVcpuFlags, /* 0.9.3 */
.domainGetVcpuPinInfo = remoteDomainGetVcpuPinInfo, /* 0.9.3 */
+ .domainPinHypervisorFlags = remoteDomainPinHypervisorFlags, /* 0.9.11 */
+ .domainGetHypervisorPinInfo = remoteDomainGetHypervisorPinInfo, /* 0.9.11 */
.domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */
.domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */
.domainGetSecurityLabel = remoteDomainGetSecurityLabel, /* 0.6.1 */
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 2d57247..1ad9b44 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1054,6 +1054,25 @@ struct remote_domain_get_vcpu_pin_info_ret {
int num;
};
+struct remote_domain_pin_hypervisor_flags_args {
+ remote_nonnull_domain dom;
+ unsigned int vcpu;
+ opaque cpumap<REMOTE_CPUMAP_MAX>; /* (unsigned char *) */
+ unsigned int flags;
+};
+
+struct remote_domain_get_hypervisor_pin_info_args {
+ remote_nonnull_domain dom;
+ int ncpumaps;
+ int maplen;
+ unsigned int flags;
+};
+
+struct remote_domain_get_hypervisor_pin_info_ret {
+ opaque cpumaps<REMOTE_CPUMAPS_MAX>;
+ int num;
+};
+
struct remote_domain_get_vcpus_args {
remote_nonnull_domain dom;
int maxinfo;
@@ -2782,7 +2801,10 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_PM_WAKEUP = 267, /* autogen autogen */
REMOTE_PROC_DOMAIN_EVENT_TRAY_CHANGE = 268, /* autogen autogen */
REMOTE_PROC_DOMAIN_EVENT_PMWAKEUP = 269, /* autogen autogen */
- REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND = 270 /* autogen autogen */
+ REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND = 270, /* autogen autogen */
+
+ REMOTE_PROC_DOMAIN_PIN_HYPERVISOR_FLAGS = 271, /* skipgen skipgen */
+ REMOTE_PROC_DOMAIN_GET_HYPERVISOR_PIN_INFO = 272 /* skipgen skipgen */
/*
* Notice how the entries are grouped in sets of 10 ?
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 9b2414f..69a80b9 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -718,6 +718,28 @@ struct remote_domain_get_vcpu_pin_info_ret {
} cpumaps;
int num;
};
+struct remote_domain_pin_hypervisor_flags_args {
+ remote_nonnull_domain dom;
+ u_int vcpu;
+ struct {
+ u_int cpumap_len;
+ char * cpumap_val;
+ } cpumap;
+ u_int flags;
+};
+struct remote_domain_get_hypervisor_pin_info_args {
+ remote_nonnull_domain dom;
+ int ncpumaps;
+ int maplen;
+ u_int flags;
+};
+struct remote_domain_get_hypervisor_pin_info_ret {
+ struct {
+ u_int cpumaps_len;
+ char * cpumaps_val;
+ } cpumaps;
+ int num;
+};
struct remote_domain_get_vcpus_args {
remote_nonnull_domain dom;
int maxinfo;
@@ -2192,4 +2214,6 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_EVENT_TRAY_CHANGE = 268,
REMOTE_PROC_DOMAIN_EVENT_PMWAKEUP = 269,
REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND = 270,
+ REMOTE_PROC_DOMAIN_PIN_HYPERVISOR_FLAGS = 271,
+ REMOTE_PROC_DOMAIN_GET_HYPERVISOR_PIN_INFO = 272,
};
--
1.7.3.1