perf: implement the remote protocol for perf event

Add remote support for perf event.

Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>
Message-id: 1459171833-26416-3-git-send-email-qiaowei.ren@intel.com

diff --git a/daemon/remote.c b/daemon/remote.c
index 3bf94fa36cebe4a1f2a002cdaea5d7cb0650ed4f..bbe22b0c8eda6b40b2171dc174337e26de8637e4 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2671,6 +2671,53 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
     return rv;
 }
 
+static int
+remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                  virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                                  virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                  virNetMessageErrorPtr rerr,
+                                  remote_domain_get_perf_events_args *args,
+                                  remote_domain_get_perf_events_ret *ret)
+{
+    virDomainPtr dom = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    int rv = -1;
+    struct daemonClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->conn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open"));
+        goto cleanup;
+    }
+
+    if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
+        goto cleanup;
+
+    if (virDomainGetPerfEvents(dom, &params, &nparams) < 0)
+        goto cleanup;
+
+    if (nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+        goto cleanup;
+    }
+
+    if (virTypedParamsSerialize(params, nparams,
+                                (virTypedParameterRemotePtr *) &ret->params.params_val,
+                                &ret->params.params_len,
+                                0) < 0)
+        goto cleanup;
+
+    rv = 0;
+
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(dom);
+    return rv;
+}
+
 static int
 remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
                                     virNetServerClientPtr client ATTRIBUTE_UNUSED,

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index be7b2f4a04f3373868b37ba334ac560a2b637e58..b3c7b9c2324a9869c216f46d3fdbbb9a11bcf3f9 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1816,6 +1816,43 @@ remoteDomainGetNumaParameters(virDomainPtr domain,
     return rv;
 }
 
+static int
+remoteDomainGetPerfEvents(virDomainPtr domain,
+                          virTypedParameterPtr *params,
+                          int *nparams)
+{
+    int rv = -1;
+    remote_domain_get_perf_events_args args;
+    remote_domain_get_perf_events_ret ret;
+    struct private_data *priv = domain->conn->privateData;
+
+    remoteDriverLock(priv);
+
+    make_nonnull_domain(&args.dom, domain);
+
+    memset(&ret, 0, sizeof(ret));
+    if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_PERF_EVENTS,
+             (xdrproc_t) xdr_remote_domain_get_perf_events_args, (char *) &args,
+             (xdrproc_t) xdr_remote_domain_get_perf_events_ret, (char *) &ret) == -1)
+        goto done;
+
+    if (virTypedParamsDeserialize((virTypedParameterRemotePtr) ret.params.params_val,
+                                         ret.params.params_len,
+                                         REMOTE_DOMAIN_PERF_EVENTS_MAX,
+                                         params,
+                                         nparams) < 0)
+        goto cleanup;
+
+    rv = 0;
+
+ cleanup:
+    xdr_free((xdrproc_t) xdr_remote_domain_get_perf_events_ret,
+             (char *) &ret);
+ done:
+    remoteDriverUnlock(priv);
+    return rv;
+}
+
 static int
 remoteDomainGetBlkioParameters(virDomainPtr domain,
                                virTypedParameterPtr params, int *nparams,
@@ -7585,6 +7622,8 @@ static virHypervisorDriver hypervisor_driver = {
     .domainGetMemoryParameters = remoteDomainGetMemoryParameters, /* 0.8.5 */
     .domainSetBlkioParameters = remoteDomainSetBlkioParameters, /* 0.9.0 */
     .domainGetBlkioParameters = remoteDomainGetBlkioParameters, /* 0.9.0 */
+    .domainGetPerfEvents = remoteDomainGetPerfEvents, /* 1.3.3 */
+    .domainSetPerfEvents = remoteDomainSetPerfEvents, /* 1.3.3 */
     .domainGetInfo = remoteDomainGetInfo, /* 0.3.0 */
     .domainGetState = remoteDomainGetState, /* 0.9.2 */
     .domainGetControlInfo = remoteDomainGetControlInfo, /* 0.9.3 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 017bdbba9316256e1038803cc8aa9f46517a7523..cb19bc079d5e2e36b225d2433dc854093079ea8f 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -109,6 +109,9 @@ const REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX = 16;
 /* Upper limit on list of numa parameters. */
 const REMOTE_DOMAIN_NUMA_PARAMETERS_MAX = 16;
 
+/* Upper limit on list of perf events. */
+const REMOTE_DOMAIN_PERF_EVENTS_MAX = 64;
+
 /* Upper limit on block copy tunable parameters. */
 const REMOTE_DOMAIN_BLOCK_COPY_PARAMETERS_MAX = 16;
 
@@ -628,6 +631,19 @@ struct remote_domain_get_numa_parameters_ret {
     int nparams;
 };
 
+struct remote_domain_set_perf_events_args {
+    remote_nonnull_domain dom;
+    remote_typed_param params<REMOTE_DOMAIN_PERF_EVENTS_MAX>;
+};
+
+struct remote_domain_get_perf_events_args {
+    remote_nonnull_domain dom;
+};
+
+struct remote_domain_get_perf_events_ret {
+    remote_typed_param params<REMOTE_DOMAIN_PERF_EVENTS_MAX>;
+};
+
 struct remote_domain_block_stats_args {
     remote_nonnull_domain dom;
     remote_nonnull_string path;
@@ -5751,5 +5767,17 @@ enum remote_procedure {
      * @generate: both
      * @acl: domain:migrate
      */
-    REMOTE_PROC_DOMAIN_MIGRATE_START_POST_COPY = 364
+    REMOTE_PROC_DOMAIN_MIGRATE_START_POST_COPY = 364,
+
+    /**
+     * @generate: none
+     * @acl: domain:read
+     */
+    REMOTE_PROC_DOMAIN_GET_PERF_EVENTS = 365,
+
+    /**
+     * @generate: both
+     * @acl: domain:write
+     */
+    REMOTE_PROC_DOMAIN_SET_PERF_EVENTS = 366
 };

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 9d59e0e7fab15b5884868940ec4a4893717a98b1..1257aac51dfbc0d152b9ae4a30eb72452d34924b 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -304,6 +304,22 @@ struct remote_domain_get_numa_parameters_ret {
         } params;
         int                        nparams;
 };
+struct remote_domain_set_perf_events_args {
+        remote_nonnull_domain      dom;
+        struct {
+                u_int              params_len;
+                remote_typed_param * params_val;
+        } params;
+};
+struct remote_domain_get_perf_events_args {
+        remote_nonnull_domain      dom;
+};
+struct remote_domain_get_perf_events_ret {
+        struct {
+                u_int              params_len;
+                remote_typed_param * params_val;
+        } params;
+};
 struct remote_domain_block_stats_args {
         remote_nonnull_domain      dom;
         remote_nonnull_string      path;
@@ -3077,4 +3093,6 @@ enum remote_procedure {
         REMOTE_PROC_CONNECT_EVENT_CONNECTION_CLOSED = 362,
         REMOTE_PROC_DOMAIN_EVENT_CALLBACK_JOB_COMPLETED = 363,
         REMOTE_PROC_DOMAIN_MIGRATE_START_POST_COPY = 364,
+        REMOTE_PROC_DOMAIN_GET_PERF_EVENTS = 365,
+        REMOTE_PROC_DOMAIN_SET_PERF_EVENTS = 366,
 };