External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-04 07:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: prefer newer API names internally

Browse Source 
Rather mechanical in nature.

* src/driver.h: Use newer virTypedParameter API names.
* src/libvirt.c: Likewise.
* daemon/remote.c: Likewise.
* src/esx/esx_driver.c: Likewise.
* src/libxl/libxl_driver.c: Likewise.
* src/lxc/lxc_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/remote/remote_driver.c: Likewise.
* src/test/test_driver.c: Likewise.
* src/xen/xen_driver.c: Likewise.
* src/xen/xen_hypervisor.c: Likewise.
* src/xen/xen_hypervisor.h: Likewise.
* src/xen/xend_internal.c: Likewise.
* tools/virsh.c: Likewise.
This commit is contained in:
Eric Blake 2011-05-26 11:39:04 -06:00 committed by Daniel Veillard
parent a9b3a78fa6
commit 163e5f04ef
14 changed files with 150 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/remote.c
View File

@ -505,7 +505,7 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE
remote_domain_get_scheduler_parameters_ret *ret) remote_domain_get_scheduler_parameters_ret *ret)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virSchedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i; int i;
int nparams = args->nparams; int nparams = args->nparams;
int rv = -1; int rv = -1;
@ -590,7 +590,7 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE
void *ret ATTRIBUTE_UNUSED) void *ret ATTRIBUTE_UNUSED)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virSchedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i, nparams; int i, nparams;
int rv = -1; int rv = -1;
@ -661,7 +661,7 @@ remoteDispatchDomainSetSchedulerParametersFlags(struct qemud_server *server ATTR
void *ret ATTRIBUTE_UNUSED) void *ret ATTRIBUTE_UNUSED)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virSchedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i, nparams; int i, nparams;
int rv = -1; int rv = -1;
@ -1227,7 +1227,7 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server
* args, void *ret ATTRIBUTE_UNUSED) * args, void *ret ATTRIBUTE_UNUSED)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virMemoryParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i, nparams; int i, nparams;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
@ -1325,7 +1325,7 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server
* ret) * ret)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virMemoryParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i; int i;
int nparams = args->nparams; int nparams = args->nparams;
unsigned int flags; unsigned int flags;
@ -1445,7 +1445,7 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server
* args, void *ret ATTRIBUTE_UNUSED) * args, void *ret ATTRIBUTE_UNUSED)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virBlkioParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i, nparams; int i, nparams;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
@ -1543,7 +1543,7 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server
* ret) * ret)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virBlkioParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int i; int i;
int nparams = args->nparams; int nparams = args->nparams;
unsigned int flags; unsigned int flags;

14
src/driver.h
View File

@ -141,25 +141,25 @@ typedef int
typedef int typedef int
(*virDrvDomainSetMemoryParameters) (*virDrvDomainSetMemoryParameters)
(virDomainPtr domain, (virDomainPtr domain,
virMemoryParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags); unsigned int flags);
typedef int typedef int
(*virDrvDomainGetMemoryParameters) (*virDrvDomainGetMemoryParameters)
(virDomainPtr domain, (virDomainPtr domain,
virMemoryParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags); unsigned int flags);
typedef int typedef int
(*virDrvDomainSetBlkioParameters) (*virDrvDomainSetBlkioParameters)
(virDomainPtr domain, (virDomainPtr domain,
virBlkioParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags); unsigned int flags);
typedef int typedef int
(*virDrvDomainGetBlkioParameters) (*virDrvDomainGetBlkioParameters)
(virDomainPtr domain, (virDomainPtr domain,
virBlkioParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags); unsigned int flags);
typedef int typedef int
@ -276,19 +276,19 @@ typedef char *
typedef int typedef int
(*virDrvDomainGetSchedulerParameters) (*virDrvDomainGetSchedulerParameters)
(virDomainPtr domain, (virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int *nparams); int *nparams);
typedef int typedef int
(*virDrvDomainSetSchedulerParameters) (*virDrvDomainSetSchedulerParameters)
(virDomainPtr domain, (virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams); int nparams);
typedef int typedef int
(*virDrvDomainSetSchedulerParametersFlags) (*virDrvDomainSetSchedulerParametersFlags)
(virDomainPtr domain, (virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags); unsigned int flags);

36
src/esx/esx_driver.c
View File

@ -3519,12 +3519,12 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
* *
* Available parameters: * Available parameters:
* *
* - reservation (VIR_DOMAIN_SCHED_FIELD_LLONG >= 0, in megaherz) * - reservation (VIR_TYPED_PARAM_LLONG >= 0, in megaherz)
* *
* The amount of CPU resource that is guaranteed to be available to the domain. * The amount of CPU resource that is guaranteed to be available to the domain.
* *
* *
* - limit (VIR_DOMAIN_SCHED_FIELD_LLONG >= 0, or -1, in megaherz) * - limit (VIR_TYPED_PARAM_LLONG >= 0, or -1, in megaherz)
* *
* The CPU utilization of the domain will be limited to this value, even if * The CPU utilization of the domain will be limited to this value, even if
* more CPU resources are available. If the limit is set to -1, the CPU * more CPU resources are available. If the limit is set to -1, the CPU
@ -3532,7 +3532,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
* must be greater than or equal to the reservation. * must be greater than or equal to the reservation.
* *
* *
* - shares (VIR_DOMAIN_SCHED_FIELD_INT >= 0, or in {-1, -2, -3}, no unit) * - shares (VIR_TYPED_PARAM_INT >= 0, or in {-1, -2, -3}, no unit)
* *
* Shares are used to determine relative CPU allocation between domains. In * Shares are used to determine relative CPU allocation between domains. In
* general, a domain with more shares gets proportionally more of the CPU * general, a domain with more shares gets proportionally more of the CPU
@ -3560,7 +3560,7 @@ esxDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams)
static int static int
esxDomainGetSchedulerParameters(virDomainPtr domain, esxDomainGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params, int *nparams)
{ {
int result = -1; int result = -1;
esxPrivate *priv = domain->conn->privateData; esxPrivate *priv = domain->conn->privateData;
@ -3596,10 +3596,10 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
dynamicProperty = dynamicProperty->_next) { dynamicProperty = dynamicProperty->_next) {
if (STREQ(dynamicProperty->name, "config.cpuAllocation.reservation") && if (STREQ(dynamicProperty->name, "config.cpuAllocation.reservation") &&
! (mask & (1 << 0))) { ! (mask & (1 << 0))) {
snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, "%s", snprintf (params[i].field, VIR_TYPED_PARAM_FIELD_LENGTH, "%s",
"reservation"); "reservation");
params[i].type = VIR_DOMAIN_SCHED_FIELD_LLONG; params[i].type = VIR_TYPED_PARAM_LLONG;
if (esxVI_AnyType_ExpectType(dynamicProperty->val, if (esxVI_AnyType_ExpectType(dynamicProperty->val,
esxVI_Type_Long) < 0) { esxVI_Type_Long) < 0) {
@ -3612,10 +3612,10 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
} else if (STREQ(dynamicProperty->name, } else if (STREQ(dynamicProperty->name,
"config.cpuAllocation.limit") && "config.cpuAllocation.limit") &&
! (mask & (1 << 1))) { ! (mask & (1 << 1))) {
snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, "%s", snprintf (params[i].field, VIR_TYPED_PARAM_FIELD_LENGTH, "%s",
"limit"); "limit");
params[i].type = VIR_DOMAIN_SCHED_FIELD_LLONG; params[i].type = VIR_TYPED_PARAM_LLONG;
if (esxVI_AnyType_ExpectType(dynamicProperty->val, if (esxVI_AnyType_ExpectType(dynamicProperty->val,
esxVI_Type_Long) < 0) { esxVI_Type_Long) < 0) {
@ -3628,10 +3628,10 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
} else if (STREQ(dynamicProperty->name, } else if (STREQ(dynamicProperty->name,
"config.cpuAllocation.shares") && "config.cpuAllocation.shares") &&
! (mask & (1 << 2))) { ! (mask & (1 << 2))) {
snprintf (params[i].field, VIR_DOMAIN_SCHED_FIELD_LENGTH, "%s", snprintf (params[i].field, VIR_TYPED_PARAM_FIELD_LENGTH, "%s",
"shares"); "shares");
params[i].type = VIR_DOMAIN_SCHED_FIELD_INT; params[i].type = VIR_TYPED_PARAM_INT;
if (esxVI_SharesInfo_CastFromAnyType(dynamicProperty->val, if (esxVI_SharesInfo_CastFromAnyType(dynamicProperty->val,
&sharesInfo) < 0) { &sharesInfo) < 0) {
@ -3685,7 +3685,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
static int static int
esxDomainSetSchedulerParameters(virDomainPtr domain, esxDomainSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params, int nparams)
{ {
int result = -1; int result = -1;
esxPrivate *priv = domain->conn->privateData; esxPrivate *priv = domain->conn->privateData;
@ -3711,7 +3711,7 @@ esxDomainSetSchedulerParameters(virDomainPtr domain,
for (i = 0; i < nparams; ++i) { for (i = 0; i < nparams; ++i) {
if (STREQ (params[i].field, "reservation") && if (STREQ (params[i].field, "reservation") &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_LLONG) { params[i].type == VIR_TYPED_PARAM_LLONG) {
if (esxVI_Long_Alloc(&spec->cpuAllocation->reservation) < 0) { if (esxVI_Long_Alloc(&spec->cpuAllocation->reservation) < 0) {
goto cleanup; goto cleanup;
} }
@ -3725,7 +3725,7 @@ esxDomainSetSchedulerParameters(virDomainPtr domain,
spec->cpuAllocation->reservation->value = params[i].value.l; spec->cpuAllocation->reservation->value = params[i].value.l;
} else if (STREQ (params[i].field, "limit") && } else if (STREQ (params[i].field, "limit") &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_LLONG) { params[i].type == VIR_TYPED_PARAM_LLONG) {
if (esxVI_Long_Alloc(&spec->cpuAllocation->limit) < 0) { if (esxVI_Long_Alloc(&spec->cpuAllocation->limit) < 0) {
goto cleanup; goto cleanup;
} }
@ -3740,7 +3740,7 @@ esxDomainSetSchedulerParameters(virDomainPtr domain,
spec->cpuAllocation->limit->value = params[i].value.l; spec->cpuAllocation->limit->value = params[i].value.l;
} else if (STREQ (params[i].field, "shares") && } else if (STREQ (params[i].field, "shares") &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_INT) { params[i].type == VIR_TYPED_PARAM_INT) {
if (esxVI_SharesInfo_Alloc(&sharesInfo) < 0 || if (esxVI_SharesInfo_Alloc(&sharesInfo) < 0 ||
esxVI_Int_Alloc(&sharesInfo->shares) < 0) { esxVI_Int_Alloc(&sharesInfo->shares) < 0) {
goto cleanup; goto cleanup;
@ -4533,7 +4533,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags)
static int static int
esxDomainSetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params, esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params,
int nparams, unsigned int flags) int nparams, unsigned int flags)
{ {
int result = -1; int result = -1;
@ -4561,7 +4561,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params,
for (i = 0; i < nparams; ++i) { for (i = 0; i < nparams; ++i) {
if (STREQ (params[i].field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE) && if (STREQ (params[i].field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE) &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_ULLONG) { params[i].type == VIR_TYPED_PARAM_ULLONG) {
if (esxVI_Long_Alloc(&spec->memoryAllocation->reservation) < 0) { if (esxVI_Long_Alloc(&spec->memoryAllocation->reservation) < 0) {
goto cleanup; goto cleanup;
} }
@ -4605,7 +4605,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params,
static int static int
esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params, esxDomainGetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params,
int *nparams, unsigned int flags) int *nparams, unsigned int flags)
{ {
int result = -1; int result = -1;
@ -4649,7 +4649,7 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params,
goto cleanup; goto cleanup;
} }
params[0].type = VIR_DOMAIN_SCHED_FIELD_ULLONG; params[0].type = VIR_TYPED_PARAM_ULLONG;
params[0].value.ul = reservation->value * 1024; /* Scale from megabytes to kilobytes */ params[0].value.ul = reservation->value * 1024; /* Scale from megabytes to kilobytes */
*nparams = 1; *nparams = 1;

20
src/libvirt.c
View File

@ -3003,7 +3003,7 @@ error:
*/ */
int int
virDomainSetMemoryParameters(virDomainPtr domain, virDomainSetMemoryParameters(virDomainPtr domain,
virMemoryParameterPtr params, virTypedParameterPtr params,
int nparams, unsigned int flags) int nparams, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -3057,15 +3057,15 @@ error:
* As the value of @nparams is dynamic, call the API setting @nparams to 0 and * As the value of @nparams is dynamic, call the API setting @nparams to 0 and
* @params as NULL, the API returns the number of parameters supported by the * @params as NULL, the API returns the number of parameters supported by the
* HV by updating @nparams on SUCCESS. The caller should then allocate @params * HV by updating @nparams on SUCCESS. The caller should then allocate @params
* array, i.e. (sizeof(@virMemoryParameter) * @nparams) bytes and call the API * array, i.e. (sizeof(@virTypedParameter) * @nparams) bytes and call the API
* again. * again.
* *
* Here is the sample code snippet: * Here is the sample code snippet:
* *
* if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) == 0) && * if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) == 0) &&
* (nparams != 0)) { * (nparams != 0)) {
* params = vshMalloc(ctl, sizeof(virMemoryParameter) * nparams); * params = vshMalloc(ctl, sizeof(*params) * nparams);
* memset(params, 0, sizeof(virMemoryParameter) * nparams); * memset(params, 0, sizeof(*params) * nparams);
* if (virDomainGetMemoryParameters(dom, params, &nparams, 0)) { * if (virDomainGetMemoryParameters(dom, params, &nparams, 0)) {
* vshError(ctl, "%s", _("Unable to get memory parameters")); * vshError(ctl, "%s", _("Unable to get memory parameters"));
* goto error; * goto error;
@ -3079,7 +3079,7 @@ error:
*/ */
int int
virDomainGetMemoryParameters(virDomainPtr domain, virDomainGetMemoryParameters(virDomainPtr domain,
virMemoryParameterPtr params, virTypedParameterPtr params,
int *nparams, unsigned int flags) int *nparams, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -3130,7 +3130,7 @@ error:
*/ */
int int
virDomainSetBlkioParameters(virDomainPtr domain, virDomainSetBlkioParameters(virDomainPtr domain,
virBlkioParameterPtr params, virTypedParameterPtr params,
int nparams, unsigned int flags) int nparams, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -3189,7 +3189,7 @@ error:
*/ */
int int
virDomainGetBlkioParameters(virDomainPtr domain, virDomainGetBlkioParameters(virDomainPtr domain,
virBlkioParameterPtr params, virTypedParameterPtr params,
int *nparams, unsigned int flags) int *nparams, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -5434,7 +5434,7 @@ error:
*/ */
int int
virDomainGetSchedulerParameters(virDomainPtr domain, virDomainGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params, int *nparams)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -5484,7 +5484,7 @@ error:
*/ */
int int
virDomainSetSchedulerParameters(virDomainPtr domain, virDomainSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params, int nparams)
{ {
virConnectPtr conn; virConnectPtr conn;
@ -5540,7 +5540,7 @@ error:
*/ */
int int
virDomainSetSchedulerParametersFlags(virDomainPtr domain, virDomainSetSchedulerParametersFlags(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {

14
src/libxl/libxl_driver.c
View File

@ -2950,7 +2950,7 @@ cleanup:
} }
static int static int
libxlDomainGetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params, libxlDomainGetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params,
int *nparams) int *nparams)
{ {
libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDriverPrivatePtr driver = dom->conn->privateData;
@ -3002,7 +3002,7 @@ libxlDomainGetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params,
} }
params[0].value.ui = sc_info.weight; params[0].value.ui = sc_info.weight;
params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].type = VIR_TYPED_PARAM_UINT;
if (virStrcpyStatic(params[0].field, "weight") == NULL) { if (virStrcpyStatic(params[0].field, "weight") == NULL) {
libxlError(VIR_ERR_INTERNAL_ERROR, libxlError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Field weight too long for destination")); "%s", _("Field weight too long for destination"));
@ -3010,7 +3010,7 @@ libxlDomainGetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params,
} }
params[1].value.ui = sc_info.cap; params[1].value.ui = sc_info.cap;
params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[1].type = VIR_TYPED_PARAM_UINT;
if (virStrcpyStatic(params[1].field, "cap") == NULL) { if (virStrcpyStatic(params[1].field, "cap") == NULL) {
libxlError(VIR_ERR_INTERNAL_ERROR, libxlError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Field cap too long for destination")); "%s", _("Field cap too long for destination"));
@ -3027,7 +3027,7 @@ cleanup:
} }
static int static int
libxlDomainSetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params, libxlDomainSetSchedulerParameters(virDomainPtr dom, virTypedParameterPtr params,
int nparams) int nparams)
{ {
libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDriverPrivatePtr driver = dom->conn->privateData;
@ -3075,10 +3075,10 @@ libxlDomainSetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params,
} }
for (i = 0; i < nparams; ++i) { for (i = 0; i < nparams; ++i) {
virSchedParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STREQ(param->field, "weight")) { if (STREQ(param->field, "weight")) {
if (param->type != VIR_DOMAIN_SCHED_FIELD_UINT) { if (param->type != VIR_TYPED_PARAM_UINT) {
libxlError(VIR_ERR_INVALID_ARG, "%s", libxlError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for weight tunable, expected a 'uint'")); _("invalid type for weight tunable, expected a 'uint'"));
goto cleanup; goto cleanup;
@ -3086,7 +3086,7 @@ libxlDomainSetSchedulerParameters(virDomainPtr dom, virSchedParameterPtr params,
sc_info.weight = params[i].value.ui; sc_info.weight = params[i].value.ui;
} else if (STREQ(param->field, "cap")) { } else if (STREQ(param->field, "cap")) {
if (param->type != VIR_DOMAIN_SCHED_FIELD_UINT) { if (param->type != VIR_TYPED_PARAM_UINT) {
libxlError(VIR_ERR_INVALID_ARG, "%s", libxlError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for cap tunable, expected a 'uint'")); _("invalid type for cap tunable, expected a 'uint'"));
goto cleanup; goto cleanup;

26
src/lxc/lxc_driver.c
View File

@ -745,7 +745,7 @@ cleanup:
} }
static int lxcDomainSetMemoryParameters(virDomainPtr dom, static int lxcDomainSetMemoryParameters(virDomainPtr dom,
virMemoryParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
@ -774,11 +774,11 @@ static int lxcDomainSetMemoryParameters(virDomainPtr dom,
ret = 0; ret = 0;
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virMemoryParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
lxcError(VIR_ERR_INVALID_ARG, "%s", lxcError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for memory hard_limit tunable, expected a 'ullong'")); _("invalid type for memory hard_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -793,7 +793,7 @@ static int lxcDomainSetMemoryParameters(virDomainPtr dom,
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
lxcError(VIR_ERR_INVALID_ARG, "%s", lxcError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for memory soft_limit tunable, expected a 'ullong'")); _("invalid type for memory soft_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -808,7 +808,7 @@ static int lxcDomainSetMemoryParameters(virDomainPtr dom,
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
lxcError(VIR_ERR_INVALID_ARG, "%s", lxcError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for swap_hard_limit tunable, expected a 'ullong'")); _("invalid type for swap_hard_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -842,7 +842,7 @@ cleanup:
} }
static int lxcDomainGetMemoryParameters(virDomainPtr dom, static int lxcDomainGetMemoryParameters(virDomainPtr dom,
virMemoryParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
@ -884,10 +884,10 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom,
} }
for (i = 0; i < LXC_NB_MEM_PARAM; i++) { for (i = 0; i < LXC_NB_MEM_PARAM; i++) {
virMemoryParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
val = 0; val = 0;
param->value.ul = 0; param->value.ul = 0;
param->type = VIR_DOMAIN_MEMORY_PARAM_ULLONG; param->type = VIR_TYPED_PARAM_ULLONG;
switch(i) { switch(i) {
case 0: /* fill memory hard limit here */ case 0: /* fill memory hard limit here */
@ -2162,7 +2162,7 @@ static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED,
} }
static int lxcSetSchedulerParameters(virDomainPtr domain, static int lxcSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams) int nparams)
{ {
lxc_driver_t *driver = domain->conn->privateData; lxc_driver_t *driver = domain->conn->privateData;
@ -2189,7 +2189,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain,
goto cleanup; goto cleanup;
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virSchedParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STRNEQ(param->field, "cpu_shares")) { if (STRNEQ(param->field, "cpu_shares")) {
lxcError(VIR_ERR_INVALID_ARG, lxcError(VIR_ERR_INVALID_ARG,
@ -2197,7 +2197,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain,
goto cleanup; goto cleanup;
} }
if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
lxcError(VIR_ERR_INVALID_ARG, "%s", lxcError(VIR_ERR_INVALID_ARG, "%s",
_("Invalid type for cpu_shares tunable, expected a 'ullong'")); _("Invalid type for cpu_shares tunable, expected a 'ullong'"));
goto cleanup; goto cleanup;
@ -2223,7 +2223,7 @@ cleanup:
} }
static int lxcGetSchedulerParameters(virDomainPtr domain, static int lxcGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int *nparams) int *nparams)
{ {
lxc_driver_t *driver = domain->conn->privateData; lxc_driver_t *driver = domain->conn->privateData;
@ -2263,7 +2263,7 @@ static int lxcGetSchedulerParameters(virDomainPtr domain,
"%s", _("Field cpu_shares too big for destination")); "%s", _("Field cpu_shares too big for destination"));
goto cleanup; goto cleanup;
} }
params[0].type = VIR_DOMAIN_SCHED_FIELD_ULLONG; params[0].type = VIR_TYPED_PARAM_ULLONG;
*nparams = 1; *nparams = 1;
ret = 0; ret = 0;

40
src/qemu/qemu_driver.c
View File

@ -4686,7 +4686,7 @@ cleanup:
} }
static int qemuDomainSetBlkioParameters(virDomainPtr dom, static int qemuDomainSetBlkioParameters(virDomainPtr dom,
virBlkioParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
@ -4725,11 +4725,11 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom,
ret = 0; ret = 0;
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virBlkioParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_BLKIO_PARAM_UINT) { if (param->type != VIR_TYPED_PARAM_UINT) {
qemuReportError(VIR_ERR_INVALID_ARG, "%s", qemuReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for blkio weight tunable, expected a 'unsigned int'")); _("invalid type for blkio weight tunable, expected a 'unsigned int'"));
ret = -1; ret = -1;
@ -4765,7 +4765,7 @@ cleanup:
} }
static int qemuDomainGetBlkioParameters(virDomainPtr dom, static int qemuDomainGetBlkioParameters(virDomainPtr dom,
virBlkioParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
@ -4819,10 +4819,10 @@ static int qemuDomainGetBlkioParameters(virDomainPtr dom,
} }
for (i = 0; i < *nparams; i++) { for (i = 0; i < *nparams; i++) {
virBlkioParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
val = 0; val = 0;
param->value.ui = 0; param->value.ui = 0;
param->type = VIR_DOMAIN_BLKIO_PARAM_UINT; param->type = VIR_TYPED_PARAM_UINT;
switch (i) { switch (i) {
case 0: /* fill blkio weight here */ case 0: /* fill blkio weight here */
@ -4858,7 +4858,7 @@ cleanup:
} }
static int qemuDomainSetMemoryParameters(virDomainPtr dom, static int qemuDomainSetMemoryParameters(virDomainPtr dom,
virMemoryParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
@ -4924,11 +4924,11 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
ret = 0; ret = 0;
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virMemoryParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
qemuReportError(VIR_ERR_INVALID_ARG, "%s", qemuReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for memory hard_limit tunable, expected a 'ullong'")); _("invalid type for memory hard_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -4949,7 +4949,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
qemuReportError(VIR_ERR_INVALID_ARG, "%s", qemuReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for memory soft_limit tunable, expected a 'ullong'")); _("invalid type for memory soft_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -4970,7 +4970,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom,
} }
} else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) {
int rc; int rc;
if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
qemuReportError(VIR_ERR_INVALID_ARG, "%s", qemuReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for swap_hard_limit tunable, expected a 'ullong'")); _("invalid type for swap_hard_limit tunable, expected a 'ullong'"));
ret = -1; ret = -1;
@ -5012,7 +5012,7 @@ cleanup:
} }
static int qemuDomainGetMemoryParameters(virDomainPtr dom, static int qemuDomainGetMemoryParameters(virDomainPtr dom,
virMemoryParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
@ -5135,10 +5135,10 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom,
} }
for (i = 0; i < QEMU_NB_MEM_PARAM; i++) { for (i = 0; i < QEMU_NB_MEM_PARAM; i++) {
virMemoryParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
val = 0; val = 0;
param->value.ul = 0; param->value.ul = 0;
param->type = VIR_DOMAIN_MEMORY_PARAM_ULLONG; param->type = VIR_TYPED_PARAM_ULLONG;
switch (i) { switch (i) {
case 0: /* fill memory hard limit here */ case 0: /* fill memory hard limit here */
@ -5206,7 +5206,7 @@ cleanup:
} }
static int qemuSetSchedulerParametersFlags(virDomainPtr dom, static int qemuSetSchedulerParametersFlags(virDomainPtr dom,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
@ -5267,11 +5267,11 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom,
} }
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
virSchedParameterPtr param = &params[i]; virTypedParameterPtr param = &params[i];
if (STREQ(param->field, "cpu_shares")) { if (STREQ(param->field, "cpu_shares")) {
int rc; int rc;
if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { if (param->type != VIR_TYPED_PARAM_ULLONG) {
qemuReportError(VIR_ERR_INVALID_ARG, "%s", qemuReportError(VIR_ERR_INVALID_ARG, "%s",
_("invalid type for cpu_shares tunable, expected a 'ullong'")); _("invalid type for cpu_shares tunable, expected a 'ullong'"));
goto cleanup; goto cleanup;
@ -5321,7 +5321,7 @@ cleanup:
} }
static int qemuSetSchedulerParameters(virDomainPtr dom, static int qemuSetSchedulerParameters(virDomainPtr dom,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams) int nparams)
{ {
return qemuSetSchedulerParametersFlags(dom, return qemuSetSchedulerParametersFlags(dom,
@ -5331,7 +5331,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom,
} }
static int qemuGetSchedulerParameters(virDomainPtr dom, static int qemuGetSchedulerParameters(virDomainPtr dom,
virSchedParameterPtr params, virTypedParameterPtr params,
int *nparams) int *nparams)
{ {
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
@ -5381,7 +5381,7 @@ static int qemuGetSchedulerParameters(virDomainPtr dom,
} }
out: out:
params[0].value.ul = val; params[0].value.ul = val;
params[0].type = VIR_DOMAIN_SCHED_FIELD_ULLONG; params[0].type = VIR_TYPED_PARAM_ULLONG;
if (virStrcpyStatic(params[0].field, "cpu_shares") == NULL) { if (virStrcpyStatic(params[0].field, "cpu_shares") == NULL) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Field cpu_shares too long for destination")); "%s", _("Field cpu_shares too long for destination"));

20
src/remote/remote_driver.c
View File

@ -1781,7 +1781,7 @@ done:
static int static int
remoteDomainSetMemoryParameters (virDomainPtr domain, remoteDomainSetMemoryParameters (virDomainPtr domain,
virMemoryParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
@ -1856,7 +1856,7 @@ done:
static int static int
remoteDomainGetMemoryParameters (virDomainPtr domain, remoteDomainGetMemoryParameters (virDomainPtr domain,
virMemoryParameterPtr params, int *nparams, virTypedParameterPtr params, int *nparams,
unsigned int flags) unsigned int flags)
{ {
int rv = -1; int rv = -1;
@ -1950,9 +1950,9 @@ done:
static int static int
remoteDomainSetBlkioParameters (virDomainPtr domain, remoteDomainSetBlkioParameters (virDomainPtr domain,
virBlkioParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {
int rv = -1; int rv = -1;
remote_domain_set_blkio_parameters_args args; remote_domain_set_blkio_parameters_args args;
@ -2025,8 +2025,8 @@ done:
static int static int
remoteDomainGetBlkioParameters (virDomainPtr domain, remoteDomainGetBlkioParameters (virDomainPtr domain,
virBlkioParameterPtr params, int *nparams, virTypedParameterPtr params, int *nparams,
unsigned int flags) unsigned int flags)
{ {
int rv = -1; int rv = -1;
remote_domain_get_blkio_parameters_args args; remote_domain_get_blkio_parameters_args args;
@ -2470,7 +2470,7 @@ done:
static int static int
remoteDomainGetSchedulerParameters (virDomainPtr domain, remoteDomainGetSchedulerParameters (virDomainPtr domain,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params, int *nparams)
{ {
int rv = -1; int rv = -1;
remote_domain_get_scheduler_parameters_args args; remote_domain_get_scheduler_parameters_args args;
@ -2540,7 +2540,7 @@ done:
static int static int
remoteDomainSetSchedulerParameters (virDomainPtr domain, remoteDomainSetSchedulerParameters (virDomainPtr domain,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params, int nparams)
{ {
int rv = -1; int rv = -1;
remote_domain_set_scheduler_parameters_args args; remote_domain_set_scheduler_parameters_args args;
@ -2605,7 +2605,7 @@ done:
static int static int
remoteDomainSetSchedulerParametersFlags(virDomainPtr domain, remoteDomainSetSchedulerParametersFlags(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
unsigned int flags) unsigned int flags)
{ {

8
src/test/test_driver.c
View File

@ -2637,7 +2637,7 @@ static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED,
} }
static int testDomainGetSchedulerParams(virDomainPtr domain, static int testDomainGetSchedulerParams(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int *nparams) int *nparams)
{ {
testConnPtr privconn = domain->conn->privateData; testConnPtr privconn = domain->conn->privateData;
@ -2659,7 +2659,7 @@ static int testDomainGetSchedulerParams(virDomainPtr domain,
goto cleanup; goto cleanup;
} }
strcpy(params[0].field, "weight"); strcpy(params[0].field, "weight");
params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].type = VIR_TYPED_PARAM_UINT;
/* XXX */ /* XXX */
/*params[0].value.ui = privdom->weight;*/ /*params[0].value.ui = privdom->weight;*/
params[0].value.ui = 50; params[0].value.ui = 50;
@ -2675,7 +2675,7 @@ cleanup:
static int testDomainSetSchedulerParams(virDomainPtr domain, static int testDomainSetSchedulerParams(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams) int nparams)
{ {
testConnPtr privconn = domain->conn->privateData; testConnPtr privconn = domain->conn->privateData;
@ -2697,7 +2697,7 @@ static int testDomainSetSchedulerParams(virDomainPtr domain,
testError(VIR_ERR_INVALID_ARG, "field"); testError(VIR_ERR_INVALID_ARG, "field");
goto cleanup; goto cleanup;
} }
if (params[i].type != VIR_DOMAIN_SCHED_FIELD_UINT) { if (params[i].type != VIR_TYPED_PARAM_UINT) {
testError(VIR_ERR_INVALID_ARG, "type"); testError(VIR_ERR_INVALID_ARG, "type");
goto cleanup; goto cleanup;
} }

6
src/xen/xen_driver.c
View File

@ -1677,7 +1677,8 @@ xenUnifiedDomainGetSchedulerType (virDomainPtr dom, int *nparams)
static int static int
xenUnifiedDomainGetSchedulerParameters (virDomainPtr dom, xenUnifiedDomainGetSchedulerParameters (virDomainPtr dom,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params,
int *nparams)
{ {
GET_PRIVATE(dom->conn); GET_PRIVATE(dom->conn);
int i, ret; int i, ret;
@ -1694,7 +1695,8 @@ xenUnifiedDomainGetSchedulerParameters (virDomainPtr dom,
static int static int
xenUnifiedDomainSetSchedulerParameters (virDomainPtr dom, xenUnifiedDomainSetSchedulerParameters (virDomainPtr dom,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params,
int nparams)
{ {
GET_PRIVATE(dom->conn); GET_PRIVATE(dom->conn);
int i, ret; int i, ret;

14
src/xen/xen_hypervisor.c
View File

@ -1,7 +1,7 @@
/* /*
* xen_internal.c: direct access to Xen hypervisor level * xen_internal.c: direct access to Xen hypervisor level
* *
* Copyright (C) 2005-2010 Red Hat, Inc. * Copyright (C) 2005-2011 Red Hat, Inc.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
* *
@ -1242,7 +1242,7 @@ static const char *str_cap = "cap";
*/ */
int int
xenHypervisorGetSchedulerParameters(virDomainPtr domain, xenHypervisorGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params, int *nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
@ -1317,7 +1317,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
"Weight %s too big for destination", str_weight); "Weight %s too big for destination", str_weight);
return -1; return -1;
} }
params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].type = VIR_TYPED_PARAM_UINT;
params[0].value.ui = op_dom.u.getschedinfo.u.credit.weight; params[0].value.ui = op_dom.u.getschedinfo.u.credit.weight;
if (virStrcpyStatic(params[1].field, str_cap) == NULL) { if (virStrcpyStatic(params[1].field, str_cap) == NULL) {
@ -1325,7 +1325,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
"Cap %s too big for destination", str_cap); "Cap %s too big for destination", str_cap);
return -1; return -1;
} }
params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[1].type = VIR_TYPED_PARAM_UINT;
params[1].value.ui = op_dom.u.getschedinfo.u.credit.cap; params[1].value.ui = op_dom.u.getschedinfo.u.credit.cap;
*nparams = XEN_SCHED_CRED_NPARAM; *nparams = XEN_SCHED_CRED_NPARAM;
@ -1351,7 +1351,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
*/ */
int int
xenHypervisorSetSchedulerParameters(virDomainPtr domain, xenHypervisorSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params, int nparams)
{ {
int i; int i;
unsigned int val; unsigned int val;
@ -1424,7 +1424,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain,
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
memset(&buf, 0, sizeof(buf)); memset(&buf, 0, sizeof(buf));
if (STREQ (params[i].field, str_weight) && if (STREQ (params[i].field, str_weight) &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { params[i].type == VIR_TYPED_PARAM_UINT) {
val = params[i].value.ui; val = params[i].value.ui;
if ((val < 1) || (val > USHRT_MAX)) { if ((val < 1) || (val > USHRT_MAX)) {
snprintf(buf, sizeof(buf), _("Credit scheduler weight parameter (%d) is out of range (1-65535)"), val); snprintf(buf, sizeof(buf), _("Credit scheduler weight parameter (%d) is out of range (1-65535)"), val);
@ -1433,7 +1433,7 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain,
} }
op_dom.u.getschedinfo.u.credit.weight = val; op_dom.u.getschedinfo.u.credit.weight = val;
} else if (STREQ (params[i].field, str_cap) && } else if (STREQ (params[i].field, str_cap) &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { params[i].type == VIR_TYPED_PARAM_UINT) {
val = params[i].value.ui; val = params[i].value.ui;
if (val >= USHRT_MAX) { if (val >= USHRT_MAX) {
snprintf(buf, sizeof(buf), _("Credit scheduler cap parameter (%d) is out of range (0-65534)"), val); snprintf(buf, sizeof(buf), _("Credit scheduler cap parameter (%d) is out of range (0-65534)"), val);

6
src/xen/xen_hypervisor.h
View File

@ -1,7 +1,7 @@
/* /*
* xen_internal.h: internal API for direct access to Xen hypervisor level * xen_internal.h: internal API for direct access to Xen hypervisor level
* *
* Copyright (C) 2005, 2010 Red Hat, Inc. * Copyright (C) 2005, 2010-2011 Red Hat, Inc.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
* *
@ -101,12 +101,12 @@ char * xenHypervisorGetSchedulerType (virDomainPtr domain,
ATTRIBUTE_NONNULL (1); ATTRIBUTE_NONNULL (1);
int xenHypervisorGetSchedulerParameters(virDomainPtr domain, int xenHypervisorGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int *nparams) int *nparams)
ATTRIBUTE_NONNULL (1); ATTRIBUTE_NONNULL (1);
int xenHypervisorSetSchedulerParameters(virDomainPtr domain, int xenHypervisorSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, virTypedParameterPtr params,
int nparams) int nparams)
ATTRIBUTE_NONNULL (1); ATTRIBUTE_NONNULL (1);

12
src/xen/xend_internal.c
View File

@ -3597,7 +3597,7 @@ static const char *str_cap = "cap";
*/ */
static int static int
xenDaemonGetSchedulerParameters(virDomainPtr domain, xenDaemonGetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int *nparams) virTypedParameterPtr params, int *nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
struct sexpr *root; struct sexpr *root;
@ -3667,7 +3667,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain,
str_weight); str_weight);
goto error; goto error;
} }
params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].type = VIR_TYPED_PARAM_UINT;
params[0].value.ui = sexpr_int(root, "domain/cpu_weight"); params[0].value.ui = sexpr_int(root, "domain/cpu_weight");
if (virStrcpyStatic(params[1].field, str_cap) == NULL) { if (virStrcpyStatic(params[1].field, str_cap) == NULL) {
@ -3675,7 +3675,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain,
_("Cap %s too big for destination"), str_cap); _("Cap %s too big for destination"), str_cap);
goto error; goto error;
} }
params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[1].type = VIR_TYPED_PARAM_UINT;
params[1].value.ui = sexpr_int(root, "domain/cpu_cap"); params[1].value.ui = sexpr_int(root, "domain/cpu_cap");
*nparams = XEN_SCHED_CRED_NPARAM; *nparams = XEN_SCHED_CRED_NPARAM;
ret = 0; ret = 0;
@ -3703,7 +3703,7 @@ error:
*/ */
static int static int
xenDaemonSetSchedulerParameters(virDomainPtr domain, xenDaemonSetSchedulerParameters(virDomainPtr domain,
virSchedParameterPtr params, int nparams) virTypedParameterPtr params, int nparams)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
struct sexpr *root; struct sexpr *root;
@ -3754,10 +3754,10 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain,
memset(&buf_cap, 0, VIR_UUID_BUFLEN); memset(&buf_cap, 0, VIR_UUID_BUFLEN);
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
if (STREQ (params[i].field, str_weight) && if (STREQ (params[i].field, str_weight) &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { params[i].type == VIR_TYPED_PARAM_UINT) {
snprintf(buf_weight, sizeof(buf_weight), "%u", params[i].value.ui); snprintf(buf_weight, sizeof(buf_weight), "%u", params[i].value.ui);
} else if (STREQ (params[i].field, str_cap) && } else if (STREQ (params[i].field, str_cap) &&
params[i].type == VIR_DOMAIN_SCHED_FIELD_UINT) { params[i].type == VIR_TYPED_PARAM_UINT) {
snprintf(buf_cap, sizeof(buf_cap), "%u", params[i].value.ui); snprintf(buf_cap, sizeof(buf_cap), "%u", params[i].value.ui);
} else { } else {
virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__);

68
tools/virsh.c
View File

@ -1617,13 +1617,13 @@ static const vshCmdOptDef opts_schedinfo[] = {
static int static int
cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
virSchedParameterPtr param) virTypedParameterPtr param)
{ {
const char *data = NULL; const char *data = NULL;
/* Legacy 'weight' parameter */ /* Legacy 'weight' parameter */
if (STREQ(param->field, "weight") && if (STREQ(param->field, "weight") &&
param->type == VIR_DOMAIN_SCHED_FIELD_UINT && param->type == VIR_TYPED_PARAM_UINT &&
vshCommandOptBool(cmd, "weight")) { vshCommandOptBool(cmd, "weight")) {
int val; int val;
if (vshCommandOptInt(cmd, "weight", &val) <= 0) { if (vshCommandOptInt(cmd, "weight", &val) <= 0) {
@ -1637,7 +1637,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
/* Legacy 'cap' parameter */ /* Legacy 'cap' parameter */
if (STREQ(param->field, "cap") && if (STREQ(param->field, "cap") &&
param->type == VIR_DOMAIN_SCHED_FIELD_UINT && param->type == VIR_TYPED_PARAM_UINT &&
vshCommandOptBool(cmd, "cap")) { vshCommandOptBool(cmd, "cap")) {
int val; int val;
if (vshCommandOptInt(cmd, "cap", &val) <= 0) { if (vshCommandOptInt(cmd, "cap", &val) <= 0) {
@ -1665,41 +1665,41 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd,
return 0; return 0;
switch (param->type) { switch (param->type) {
case VIR_DOMAIN_SCHED_FIELD_INT: case VIR_TYPED_PARAM_INT:
if (virStrToLong_i(val, NULL, 10, &param->value.i) < 0) { if (virStrToLong_i(val, NULL, 10, &param->value.i) < 0) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("Invalid value for parameter, expecting an int")); _("Invalid value for parameter, expecting an int"));
return -1; return -1;
} }
break; break;
case VIR_DOMAIN_SCHED_FIELD_UINT: case VIR_TYPED_PARAM_UINT:
if (virStrToLong_ui(val, NULL, 10, &param->value.ui) < 0) { if (virStrToLong_ui(val, NULL, 10, &param->value.ui) < 0) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("Invalid value for parameter, expecting an unsigned int")); _("Invalid value for parameter, expecting an unsigned int"));
return -1; return -1;
} }
break; break;
case VIR_DOMAIN_SCHED_FIELD_LLONG: case VIR_TYPED_PARAM_LLONG:
if (virStrToLong_ll(val, NULL, 10, &param->value.l) < 0) { if (virStrToLong_ll(val, NULL, 10, &param->value.l) < 0) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("Invalid value for parameter, expecting a long long")); _("Invalid value for parameter, expecting a long long"));
return -1; return -1;
} }
break; break;
case VIR_DOMAIN_SCHED_FIELD_ULLONG: case VIR_TYPED_PARAM_ULLONG:
if (virStrToLong_ull(val, NULL, 10, &param->value.ul) < 0) { if (virStrToLong_ull(val, NULL, 10, &param->value.ul) < 0) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("Invalid value for parameter, expecting an unsigned long long")); _("Invalid value for parameter, expecting an unsigned long long"));
return -1; return -1;
} }
break; break;
case VIR_DOMAIN_SCHED_FIELD_DOUBLE: case VIR_TYPED_PARAM_DOUBLE:
if (virStrToDouble(val, NULL, &param->value.d) < 0) { if (virStrToDouble(val, NULL, &param->value.d) < 0) {
vshError(ctl, "%s", _("Invalid value for parameter, expecting a double")); vshError(ctl, "%s", _("Invalid value for parameter, expecting a double"));
return -1; return -1;
} }
break; break;
case VIR_DOMAIN_SCHED_FIELD_BOOLEAN: case VIR_TYPED_PARAM_BOOLEAN:
param->value.b = STREQ(val, "0") ? 0 : 1; param->value.b = STREQ(val, "0") ? 0 : 1;
} }
return 1; return 1;
@ -1714,7 +1714,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
{ {
char *schedulertype; char *schedulertype;
virDomainPtr dom; virDomainPtr dom;
virSchedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = 0; int nparams = 0;
int update = 0; int update = 0;
int i, ret; int i, ret;
@ -1755,9 +1755,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
} }
if (nparams) { if (nparams) {
params = vshMalloc(ctl, sizeof(virSchedParameter)* nparams); params = vshMalloc(ctl, sizeof(*params) * nparams);
memset(params, 0, sizeof(virSchedParameter)* nparams); memset(params, 0, sizeof(*params) * nparams);
ret = virDomainGetSchedulerParameters(dom, params, &nparams); ret = virDomainGetSchedulerParameters(dom, params, &nparams);
if (ret == -1) if (ret == -1)
goto cleanup; goto cleanup;
@ -1800,22 +1800,22 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
ret_val = true; ret_val = true;
for (i = 0; i < nparams; i++){ for (i = 0; i < nparams; i++){
switch (params[i].type) { switch (params[i].type) {
case VIR_DOMAIN_SCHED_FIELD_INT: case VIR_TYPED_PARAM_INT:
vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.i); vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.i);
break; break;
case VIR_DOMAIN_SCHED_FIELD_UINT: case VIR_TYPED_PARAM_UINT:
vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui); vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui);
break; break;
case VIR_DOMAIN_SCHED_FIELD_LLONG: case VIR_TYPED_PARAM_LLONG:
vshPrint(ctl, "%-15s: %lld\n", params[i].field, params[i].value.l); vshPrint(ctl, "%-15s: %lld\n", params[i].field, params[i].value.l);
break; break;
case VIR_DOMAIN_SCHED_FIELD_ULLONG: case VIR_TYPED_PARAM_ULLONG:
vshPrint(ctl, "%-15s: %llu\n", params[i].field, params[i].value.ul); vshPrint(ctl, "%-15s: %llu\n", params[i].field, params[i].value.ul);
break; break;
case VIR_DOMAIN_SCHED_FIELD_DOUBLE: case VIR_TYPED_PARAM_DOUBLE:
vshPrint(ctl, "%-15s: %f\n", params[i].field, params[i].value.d); vshPrint(ctl, "%-15s: %f\n", params[i].field, params[i].value.d);
break; break;
case VIR_DOMAIN_SCHED_FIELD_BOOLEAN: case VIR_TYPED_PARAM_BOOLEAN:
vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.b); vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.b);
break; break;
default: default:
@ -3181,7 +3181,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
int weight = 0; int weight = 0;
int nparams = 0; int nparams = 0;
unsigned int i = 0; unsigned int i = 0;
virBlkioParameterPtr params = NULL, temp = NULL; virTypedParameterPtr params = NULL, temp = NULL;
bool ret = false; bool ret = false;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
@ -3228,27 +3228,27 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
switch (params[i].type) { switch (params[i].type) {
case VIR_DOMAIN_BLKIO_PARAM_INT: case VIR_TYPED_PARAM_INT:
vshPrint(ctl, "%-15s: %d\n", params[i].field, vshPrint(ctl, "%-15s: %d\n", params[i].field,
params[i].value.i); params[i].value.i);
break; break;
case VIR_DOMAIN_BLKIO_PARAM_UINT: case VIR_TYPED_PARAM_UINT:
vshPrint(ctl, "%-15s: %u\n", params[i].field, vshPrint(ctl, "%-15s: %u\n", params[i].field,
params[i].value.ui); params[i].value.ui);
break; break;
case VIR_DOMAIN_BLKIO_PARAM_LLONG: case VIR_TYPED_PARAM_LLONG:
vshPrint(ctl, "%-15s: %lld\n", params[i].field, vshPrint(ctl, "%-15s: %lld\n", params[i].field,
params[i].value.l); params[i].value.l);
break; break;
case VIR_DOMAIN_BLKIO_PARAM_ULLONG: case VIR_TYPED_PARAM_ULLONG:
vshPrint(ctl, "%-15s: %llu\n", params[i].field, vshPrint(ctl, "%-15s: %llu\n", params[i].field,
params[i].value.ul); params[i].value.ul);
break; break;
case VIR_DOMAIN_BLKIO_PARAM_DOUBLE: case VIR_TYPED_PARAM_DOUBLE:
vshPrint(ctl, "%-15s: %f\n", params[i].field, vshPrint(ctl, "%-15s: %f\n", params[i].field,
params[i].value.d); params[i].value.d);
break; break;
case VIR_DOMAIN_BLKIO_PARAM_BOOLEAN: case VIR_TYPED_PARAM_BOOLEAN:
vshPrint(ctl, "%-15s: %d\n", params[i].field, vshPrint(ctl, "%-15s: %d\n", params[i].field,
params[i].value.b); params[i].value.b);
break; break;
@ -3264,7 +3264,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
temp = &params[i]; temp = &params[i];
temp->type = VIR_DOMAIN_BLKIO_PARAM_UINT; temp->type = VIR_TYPED_PARAM_UINT;
if (weight) { if (weight) {
temp->value.ui = weight; temp->value.ui = weight;
@ -3321,7 +3321,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
long long min_guarantee = 0; long long min_guarantee = 0;
int nparams = 0; int nparams = 0;
unsigned int i = 0; unsigned int i = 0;
virMemoryParameterPtr params = NULL, temp = NULL; virTypedParameterPtr params = NULL, temp = NULL;
bool ret = false; bool ret = false;
unsigned int flags = 0; unsigned int flags = 0;
int current = vshCommandOptBool(cmd, "current"); int current = vshCommandOptBool(cmd, "current");
@ -3391,30 +3391,30 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
switch (params[i].type) { switch (params[i].type) {
case VIR_DOMAIN_MEMORY_PARAM_INT: case VIR_TYPED_PARAM_INT:
vshPrint(ctl, "%-15s: %d\n", params[i].field, vshPrint(ctl, "%-15s: %d\n", params[i].field,
params[i].value.i); params[i].value.i);
break; break;
case VIR_DOMAIN_MEMORY_PARAM_UINT: case VIR_TYPED_PARAM_UINT:
vshPrint(ctl, "%-15s: %u\n", params[i].field, vshPrint(ctl, "%-15s: %u\n", params[i].field,
params[i].value.ui); params[i].value.ui);
break; break;
case VIR_DOMAIN_MEMORY_PARAM_LLONG: case VIR_TYPED_PARAM_LLONG:
vshPrint(ctl, "%-15s: %lld\n", params[i].field, vshPrint(ctl, "%-15s: %lld\n", params[i].field,
params[i].value.l); params[i].value.l);
break; break;
case VIR_DOMAIN_MEMORY_PARAM_ULLONG: case VIR_TYPED_PARAM_ULLONG:
if (params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) if (params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED)
vshPrint(ctl, "%-15s: unlimited\n", params[i].field); vshPrint(ctl, "%-15s: unlimited\n", params[i].field);
else else
vshPrint(ctl, "%-15s: %llu kB\n", params[i].field, vshPrint(ctl, "%-15s: %llu kB\n", params[i].field,
params[i].value.ul); params[i].value.ul);
break; break;
case VIR_DOMAIN_MEMORY_PARAM_DOUBLE: case VIR_TYPED_PARAM_DOUBLE:
vshPrint(ctl, "%-15s: %f\n", params[i].field, vshPrint(ctl, "%-15s: %f\n", params[i].field,
params[i].value.d); params[i].value.d);
break; break;
case VIR_DOMAIN_MEMORY_PARAM_BOOLEAN: case VIR_TYPED_PARAM_BOOLEAN:
vshPrint(ctl, "%-15s: %d\n", params[i].field, vshPrint(ctl, "%-15s: %d\n", params[i].field,
params[i].value.b); params[i].value.b);
break; break;
@ -3430,7 +3430,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd)
for (i = 0; i < nparams; i++) { for (i = 0; i < nparams; i++) {
temp = &params[i]; temp = &params[i];
temp->type = VIR_DOMAIN_MEMORY_PARAM_ULLONG; temp->type = VIR_TYPED_PARAM_ULLONG;
/* /*
* Some magic here, this is used to fill the params structure with * Some magic here, this is used to fill the params structure with