---
daemon/remote.c | 71 ++++++++++++++++++++++++++++++++
daemon/remote_dispatch_args.h | 1 +
daemon/remote_dispatch_prototypes.h | 8 ++++
daemon/remote_dispatch_table.h | 5 ++
src/remote/remote_driver.c | 77 +++++++++++++++++++++++++++++++++--
src/remote/remote_protocol.c | 15 +++++++
src/remote/remote_protocol.h | 13 ++++++
src/remote/remote_protocol.x | 9 ++++-
8 files changed, 194 insertions(+), 5 deletions(-)
diff --git a/daemon/remote.c b/daemon/remote.c
index dd85ef1..3ad116b 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -921,6 +921,77 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT
}
static int
+remoteDispatchDomainSetSchedulerParametersFlags (struct qemud_server *server ATTRIBUTE_UNUSED,
+ struct qemud_client *client ATTRIBUTE_UNUSED,
+ virConnectPtr conn,
+ remote_message_header *hdr ATTRIBUTE_UNUSED,
+ remote_error *rerr,
+ remote_domain_set_scheduler_parameters_flags_args *args,
+ void *ret ATTRIBUTE_UNUSED)
+{
+ virDomainPtr dom;
+ int i, r, nparams;
+ virSchedParameterPtr params;
+ unsigned int flags;
+
+ nparams = args->params.params_len;
+
+ if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
+ remoteDispatchFormatError (rerr, "%s", _("nparams too large"));
+ return -1;
+ }
+ if (VIR_ALLOC_N(params, nparams) < 0) {
+ remoteDispatchOOMError(rerr);
+ return -1;
+ }
+
+ /* Deserialise parameters. */
+ for (i = 0; i < nparams; ++i) {
+ if (virStrcpyStatic(params[i].field, args->params.params_val[i].field) == NULL) {
+ remoteDispatchFormatError(rerr, _("Field %s too big for destination"),
+ args->params.params_val[i].field);
+ return -1;
+ }
+ params[i].type = args->params.params_val[i].value.type;
+ switch (params[i].type) {
+ case VIR_DOMAIN_SCHED_FIELD_INT:
+ params[i].value.i = args->params.params_val[i].value.remote_sched_param_value_u.i; break;
+ case VIR_DOMAIN_SCHED_FIELD_UINT:
+ params[i].value.ui = args->params.params_val[i].value.remote_sched_param_value_u.ui; break;
+ case VIR_DOMAIN_SCHED_FIELD_LLONG:
+ params[i].value.l = args->params.params_val[i].value.remote_sched_param_value_u.l; break;
+ case VIR_DOMAIN_SCHED_FIELD_ULLONG:
+ params[i].value.ul = args->params.params_val[i].value.remote_sched_param_value_u.ul; break;
+ case VIR_DOMAIN_SCHED_FIELD_DOUBLE:
+ params[i].value.d = args->params.params_val[i].value.remote_sched_param_value_u.d; break;
+ case VIR_DOMAIN_SCHED_FIELD_BOOLEAN:
+ params[i].value.b = args->params.params_val[i].value.remote_sched_param_value_u.b; break;
+ }
+ }
+
+ dom = get_nonnull_domain (conn, args->dom);
+ if (dom == NULL) {
+ VIR_FREE(params);
+ remoteDispatchConnError(rerr, conn);
+ return -1;
+ }
+
+ flags = args->flags;
+
+ r = virDomainSetSchedulerParametersFlags (dom, params, nparams, flags);
+ VIR_FREE(params);
+ if (r == -1) {
+ remoteDispatchConnError(rerr, conn);
+ virDomainFree(dom);
+ return -1;
+ }
+ virDomainFree(dom);
+
+ return 0;
+}
+
+
+static int
remoteDispatchDomainBlockStats (struct qemud_server *server ATTRIBUTE_UNUSED,
struct qemud_client *client ATTRIBUTE_UNUSED,
virConnectPtr conn,
diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
index f9537d7..5cb2572 100644
--- a/daemon/remote_dispatch_args.h
+++ b/daemon/remote_dispatch_args.h
@@ -178,3 +178,4 @@
remote_domain_migrate_set_max_speed_args val_remote_domain_migrate_set_max_speed_args;
remote_storage_vol_upload_args val_remote_storage_vol_upload_args;
remote_storage_vol_download_args val_remote_storage_vol_download_args;
+ remote_domain_set_scheduler_parameters_flags_args val_remote_domain_set_scheduler_parameters_flags_args;
diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
index 18bf41d..8b249ad 100644
--- a/daemon/remote_dispatch_prototypes.h
+++ b/daemon/remote_dispatch_prototypes.h
@@ -602,6 +602,14 @@ static int remoteDispatchDomainSetSchedulerParameters(
remote_error *err,
remote_domain_set_scheduler_parameters_args *args,
void *ret);
+static int remoteDispatchDomainSetSchedulerParametersFlags(
+ struct qemud_server *server,
+ struct qemud_client *client,
+ virConnectPtr conn,
+ remote_message_header *hdr,
+ remote_error *err,
+ remote_domain_set_scheduler_parameters_flags_args *args,
+ void *ret);
static int remoteDispatchDomainSetVcpus(
struct qemud_server *server,
struct qemud_client *client,
diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
index b39f7c2..96485eb 100644
--- a/daemon/remote_dispatch_table.h
+++ b/daemon/remote_dispatch_table.h
@@ -1052,3 +1052,8 @@
.args_filter = (xdrproc_t) xdr_remote_storage_vol_download_args,
.ret_filter = (xdrproc_t) xdr_void,
},
+{ /* DomainSetSchedulerParametersFlags => 210 */
+ .fn = (dispatch_fn) remoteDispatchDomainSetSchedulerParametersFlags,
+ .args_filter = (xdrproc_t) xdr_remote_domain_set_scheduler_parameters_flags_args,
+ .ret_filter = (xdrproc_t) xdr_void,
+},
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 7fe57d0..c89cef5 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1223,7 +1223,7 @@ initialize_gnutls(char *pkipath, int flags)
goto out_of_memory;
/* Use default location as long as one of CA certificate,
- * client key, and client certificate cannot be found in
+ * client key, and client certificate can not be found in
* $HOME/.pki/libvirt, we don't want to make user confused
* with one file is here, the other is there.
*/
@@ -4058,6 +4058,76 @@ done:
}
static int
+remoteDomainSetSchedulerParametersFlags (virDomainPtr domain,
+ virSchedParameterPtr params,
+ int nparams,
+ unsigned int flags)
+{
+ int rv = -1;
+ remote_domain_set_scheduler_parameters_flags_args args;
+ int i, do_error;
+ struct private_data *priv = domain->conn->privateData;
+
+ remoteDriverLock(priv);
+
+ make_nonnull_domain (&args.dom, domain);
+
+ /* Serialise the scheduler parameters. */
+ args.params.params_len = nparams;
+ if (VIR_ALLOC_N(args.params.params_val, nparams) < 0) {
+ virReportOOMError();
+ goto done;
+ }
+
+ do_error = 0;
+ for (i = 0; i < nparams; ++i) {
+ /* call() will free this: */
+ args.params.params_val[i].field = strdup (params[i].field);
+ if (args.params.params_val[i].field == NULL) {
+ virReportOOMError();
+ do_error = 1;
+ }
+ args.params.params_val[i].value.type = params[i].type;
+ switch (params[i].type) {
+ case VIR_DOMAIN_SCHED_FIELD_INT:
+ args.params.params_val[i].value.remote_sched_param_value_u.i = params[i].value.i; break;
+ case VIR_DOMAIN_SCHED_FIELD_UINT:
+ args.params.params_val[i].value.remote_sched_param_value_u.ui = params[i].value.ui; break;
+ case VIR_DOMAIN_SCHED_FIELD_LLONG:
+ args.params.params_val[i].value.remote_sched_param_value_u.l = params[i].value.l; break;
+ case VIR_DOMAIN_SCHED_FIELD_ULLONG:
+ args.params.params_val[i].value.remote_sched_param_value_u.ul = params[i].value.ul; break;
+ case VIR_DOMAIN_SCHED_FIELD_DOUBLE:
+ args.params.params_val[i].value.remote_sched_param_value_u.d = params[i].value.d; break;
+ case VIR_DOMAIN_SCHED_FIELD_BOOLEAN:
+ args.params.params_val[i].value.remote_sched_param_value_u.b = params[i].value.b; break;
+ default:
+ remoteError(VIR_ERR_RPC, "%s", _("unknown parameter type"));
+ do_error = 1;
+ }
+ }
+
+ args.flags = flags;
+
+ if (do_error) {
+ xdr_free ((xdrproc_t) xdr_remote_domain_set_scheduler_parameters_flags_args, (char *) &args);
+ goto done;
+ }
+
+ if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS_FLAGS,
+ (xdrproc_t) xdr_remote_domain_set_scheduler_parameters_flags_args, (char *) &args,
+ (xdrproc_t) xdr_void, (char *) NULL) == -1)
+ goto done;
+
+ rv = 0;
+
+done:
+ remoteDriverUnlock(priv);
+ return rv;
+}
+
+
+static int
remoteDomainBlockStats (virDomainPtr domain, const char *path,
struct _virDomainBlockStats *stats)
{
@@ -10672,9 +10742,8 @@ remoteIOEventLoop(virConnectPtr conn,
*/
VIR_DEBUG("Waking up sleep %d %p %p", tmp->proc_nr, tmp, priv->waitDispatch);
virCondSignal(&tmp->cond);
- } else {
- prev = tmp;
}
+ prev = tmp;
tmp = tmp->next;
}
@@ -11255,7 +11324,7 @@ static virDriver remote_driver = {
remoteDomainGetSchedulerType, /* domainGetSchedulerType */
remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */
remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */
- NULL, /* domainSetSchedulerParametersFlags */
+ remoteDomainSetSchedulerParametersFlags, /* domainSetSchedulerParametersFlags */
remoteDomainMigratePrepare, /* domainMigratePrepare */
remoteDomainMigratePerform, /* domainMigratePerform */
remoteDomainMigrateFinish, /* domainMigrateFinish */
diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
index 5604371..5036cac 100644
--- a/src/remote/remote_protocol.c
+++ b/src/remote/remote_protocol.c
@@ -693,6 +693,21 @@ xdr_remote_domain_set_scheduler_parameters_args (XDR *xdrs, remote_domain_set_sc
}
bool_t
+xdr_remote_domain_set_scheduler_parameters_flags_args (XDR *xdrs, remote_domain_set_scheduler_parameters_flags_args *objp)
+{
+ char **objp_cpp0 = (char **) (void *) &objp->params.params_val;
+
+ if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
+ return FALSE;
+ if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->params.params_len, REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX,
+ sizeof (remote_sched_param), (xdrproc_t) xdr_remote_sched_param))
+ return FALSE;
+ if (!xdr_u_int (xdrs, &objp->flags))
+ return FALSE;
+ return TRUE;
+}
+
+bool_t
xdr_remote_domain_set_blkio_parameters_args (XDR *xdrs, remote_domain_set_blkio_parameters_args *objp)
{
char **objp_cpp0 = (char **) (void *) &objp->params.params_val;
diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
index d9bf151..ec576a0 100644
--- a/src/remote/remote_protocol.h
+++ b/src/remote/remote_protocol.h
@@ -357,6 +357,16 @@ struct remote_domain_set_scheduler_parameters_args {
};
typedef struct remote_domain_set_scheduler_parameters_args remote_domain_set_scheduler_parameters_args;
+struct remote_domain_set_scheduler_parameters_flags_args {
+ remote_nonnull_domain dom;
+ struct {
+ u_int params_len;
+ remote_sched_param *params_val;
+ } params;
+ u_int flags;
+};
+typedef struct remote_domain_set_scheduler_parameters_flags_args remote_domain_set_scheduler_parameters_flags_args;
+
struct remote_domain_set_blkio_parameters_args {
remote_nonnull_domain dom;
struct {
@@ -2413,6 +2423,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_SPEED = 207,
REMOTE_PROC_STORAGE_VOL_UPLOAD = 208,
REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209,
+ REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS_FLAGS = 210,
};
typedef enum remote_procedure remote_procedure;
@@ -2494,6 +2505,7 @@ extern bool_t xdr_remote_domain_get_scheduler_type_ret (XDR *, remote_domain_ge
extern bool_t xdr_remote_domain_get_scheduler_parameters_args (XDR *, remote_domain_get_scheduler_parameters_args*);
extern bool_t xdr_remote_domain_get_scheduler_parameters_ret (XDR *, remote_domain_get_scheduler_parameters_ret*);
extern bool_t xdr_remote_domain_set_scheduler_parameters_args (XDR *, remote_domain_set_scheduler_parameters_args*);
+extern bool_t xdr_remote_domain_set_scheduler_parameters_flags_args (XDR *, remote_domain_set_scheduler_parameters_flags_args*);
extern bool_t xdr_remote_domain_set_blkio_parameters_args (XDR *, remote_domain_set_blkio_parameters_args*);
extern bool_t xdr_remote_domain_get_blkio_parameters_args (XDR *, remote_domain_get_blkio_parameters_args*);
extern bool_t xdr_remote_domain_get_blkio_parameters_ret (XDR *, remote_domain_get_blkio_parameters_ret*);
@@ -2851,6 +2863,7 @@ extern bool_t xdr_remote_domain_get_scheduler_type_ret ();
extern bool_t xdr_remote_domain_get_scheduler_parameters_args ();
extern bool_t xdr_remote_domain_get_scheduler_parameters_ret ();
extern bool_t xdr_remote_domain_set_scheduler_parameters_args ();
+extern bool_t xdr_remote_domain_set_scheduler_parameters_flags_args ();
extern bool_t xdr_remote_domain_set_blkio_parameters_args ();
extern bool_t xdr_remote_domain_get_blkio_parameters_args ();
extern bool_t xdr_remote_domain_get_blkio_parameters_ret ();
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 675eccd..a320fe0 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -476,6 +476,12 @@ struct remote_domain_set_scheduler_parameters_args {
remote_sched_param params<REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX>;
};
+struct remote_domain_set_scheduler_parameters_flags_args {
+ remote_nonnull_domain dom;
+ remote_sched_param params<REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX>;
+ unsigned int flags;
+};
+
struct remote_domain_set_blkio_parameters_args {
remote_nonnull_domain dom;
remote_blkio_param params<REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX>;
@@ -2176,7 +2182,8 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_GET_BLKIO_PARAMETERS = 206,
REMOTE_PROC_DOMAIN_MIGRATE_SET_MAX_SPEED = 207,
REMOTE_PROC_STORAGE_VOL_UPLOAD = 208,
- REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209
+ REMOTE_PROC_STORAGE_VOL_DOWNLOAD = 209,
+ REMOTE_PROC_DOMAIN_SET_SCHEDULER_PARAMETERS_FLAGS = 210
/*
* Notice how the entries are grouped in sets of 10 ?
--
1.7.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list