[libvirt] [PATCH 01/21] Rename virTypedParameterArrayValidate as virTypedParamsValidate

--- docs/apibuild.py | 2 +- src/esx/esx_driver.c | 24 ++++----- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 12 ++--- src/lxc/lxc_driver.c | 40 +++++++-------- src/nodeinfo.c | 16 +++--- src/openvz/openvz_driver.c | 16 +++--- src/qemu/qemu_driver.c | 120 ++++++++++++++++++++++----------------------- src/test/test_driver.c | 8 +-- src/util/virtypedparam.c | 2 +- src/util/virtypedparam.h | 4 +- src/xen/xen_hypervisor.c | 12 ++--- 12 files changed, 129 insertions(+), 129 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index d17b593..686a234 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -64,7 +64,7 @@ ignored_functions = { "virDomainMigrateConfirm3": "private function for migration", "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", "DllMain": "specific function for Win32", - "virTypedParameterArrayValidate": "internal function in virtypedparam.c", + "virTypedParamsValidate": "internal function in virtypedparam.c", "virTypedParameterAssign": "internal function in virtypedparam.c", "virTypedParameterAssignFromStr": "internal function in virtypedparam.c", } diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d5e9c2c..a5df810 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3710,14 +3710,14 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, int i; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_RESERVATION, - VIR_TYPED_PARAM_LLONG, - VIR_DOMAIN_SCHEDULER_LIMIT, - VIR_TYPED_PARAM_LLONG, - VIR_DOMAIN_SCHEDULER_SHARES, - VIR_TYPED_PARAM_INT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_RESERVATION, + VIR_TYPED_PARAM_LLONG, + VIR_DOMAIN_SCHEDULER_LIMIT, + VIR_TYPED_PARAM_LLONG, + VIR_DOMAIN_SCHEDULER_SHARES, + VIR_TYPED_PARAM_INT, + NULL) < 0) return -1; if (esxVI_EnsureSession(priv->primary) < 0) { @@ -4874,10 +4874,10 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, int i; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_MEMORY_MIN_GUARANTEE, - VIR_TYPED_PARAM_ULLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) return -1; if (esxVI_EnsureSession(priv->primary) < 0) { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b449293..f61fe55 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1897,9 +1897,9 @@ virTPMCreateCancelPath; # util/virtypedparam.h -virTypedParameterArrayValidate; virTypedParameterAssign; virTypedParameterAssignFromStr; +virTypedParamsValidate; # util/viruri.h diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9a7cb20..481a8b1 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4172,12 +4172,12 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, int ret = -1; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_WEIGHT, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_SCHEDULER_CAP, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_WEIGHT, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_SCHEDULER_CAP, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; libxlDriverLock(driver); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3d6baf5..218715b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -752,14 +752,14 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, virLXCDomainObjPrivatePtr priv; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_MEMORY_HARD_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_SOFT_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, - VIR_TYPED_PARAM_ULLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) return -1; lxcDriverLock(driver); @@ -1732,14 +1732,14 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_CPU_SHARES, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, - VIR_TYPED_PARAM_LLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_CPU_SHARES, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, + VIR_TYPED_PARAM_LLONG, + NULL) < 0) return -1; lxcDriverLock(driver); @@ -1979,10 +1979,10 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_BLKIO_WEIGHT, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BLKIO_WEIGHT, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; lxcDriverLock(driver); diff --git a/src/nodeinfo.c b/src/nodeinfo.c index d8375ab..a50f892 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1196,14 +1196,14 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, int i; int rc; - if (virTypedParameterArrayValidate(params, nparams, - VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN, - VIR_TYPED_PARAM_UINT, - VIR_NODE_MEMORY_SHARED_SLEEP_MILLISECS, - VIR_TYPED_PARAM_UINT, - VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_NODE_MEMORY_SHARED_PAGES_TO_SCAN, + VIR_TYPED_PARAM_UINT, + VIR_NODE_MEMORY_SHARED_SLEEP_MILLISECS, + VIR_TYPED_PARAM_UINT, + VIR_NODE_MEMORY_SHARED_MERGE_ACROSS_NODES, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; if (!nodeMemoryParametersIsAllSupported(params, nparams)) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d8abe9c..d04e3ba 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1871,14 +1871,14 @@ openvzDomainSetMemoryParameters(virDomainPtr domain, goto cleanup; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_MEMORY_HARD_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_SOFT_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_MIN_GUARANTEE, - VIR_TYPED_PARAM_ULLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) return -1; for (i = 0; i < nparams; i++) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b738e0..a682e36 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7231,12 +7231,12 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_BLKIO_WEIGHT, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, - VIR_TYPED_PARAM_STRING, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BLKIO_WEIGHT, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BLKIO_DEVICE_WEIGHT, + VIR_TYPED_PARAM_STRING, + NULL) < 0) return -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -7558,14 +7558,14 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_MEMORY_HARD_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_SOFT_LIMIT, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, - VIR_TYPED_PARAM_ULLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) return -1; @@ -7836,12 +7836,12 @@ qemuDomainSetNumaParameters(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_NUMA_MODE, - VIR_TYPED_PARAM_INT, - VIR_DOMAIN_NUMA_NODESET, - VIR_TYPED_PARAM_STRING, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_NUMA_MODE, + VIR_TYPED_PARAM_INT, + VIR_DOMAIN_NUMA_NODESET, + VIR_TYPED_PARAM_STRING, + NULL) < 0) return -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -8170,18 +8170,18 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_CPU_SHARES, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, - VIR_TYPED_PARAM_LLONG, - VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA, - VIR_TYPED_PARAM_LLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_CPU_SHARES, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, + VIR_TYPED_PARAM_LLONG, + VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA, + VIR_TYPED_PARAM_LLONG, + NULL) < 0) return -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -8964,20 +8964,20 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BANDWIDTH_IN_PEAK, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BANDWIDTH_IN_BURST, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BANDWIDTH_OUT_PEAK, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_BANDWIDTH_OUT_BURST, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_BURST, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_BURST, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -14050,20 +14050,20 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, - VIR_TYPED_PARAM_ULLONG, - VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, - VIR_TYPED_PARAM_ULLONG, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) return -1; memset(&info, 0, sizeof(info)); diff --git a/src/test/test_driver.c b/src/test/test_driver.c index f1cdd92..30c2194 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2784,10 +2784,10 @@ testDomainSetSchedulerParametersFlags(virDomainPtr domain, int ret = -1, i; virCheckFlags(0, -1); - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_WEIGHT, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_WEIGHT, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; testDriverLock(privconn); diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index bf374a6..8b2211f 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virTypedParameter, VIR_TYPED_PARAM_LAST, * parameters. Return 0 on success, -1 on failure with error message * already issued. */ int -virTypedParameterArrayValidate(virTypedParameterPtr params, int nparams, ...) +virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) { va_list ap; int ret = -1; diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index c777a55..8f6bd1b 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -25,8 +25,8 @@ # include "internal.h" -int virTypedParameterArrayValidate(virTypedParameterPtr params, int nparams, - /* const char *name, int type ... */ ...) +int virTypedParamsValidate(virTypedParameterPtr params, int nparams, + /* const char *name, int type ... */ ...) ATTRIBUTE_SENTINEL ATTRIBUTE_RETURN_CHECK; int virTypedParameterAssign(virTypedParameterPtr param, const char *name, diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index cfc8139..9d9c3ee 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1277,12 +1277,12 @@ xenHypervisorSetSchedulerParameters(virConnectPtr conn, return 0; } - if (virTypedParameterArrayValidate(params, nparams, - VIR_DOMAIN_SCHEDULER_WEIGHT, - VIR_TYPED_PARAM_UINT, - VIR_DOMAIN_SCHEDULER_CAP, - VIR_TYPED_PARAM_UINT, - NULL) < 0) + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_SCHEDULER_WEIGHT, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_SCHEDULER_CAP, + VIR_TYPED_PARAM_UINT, + NULL) < 0) return -1; /* -- 1.8.2.1