]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
Rename virTypedParameterArrayValidate as virTypedParamsValidate
authorJiri Denemark <jdenemar@redhat.com>
Fri, 3 May 2013 13:34:10 +0000 (15:34 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 24 Jun 2013 22:38:24 +0000 (00:38 +0200)
12 files changed:
docs/apibuild.py
src/esx/esx_driver.c
src/libvirt_private.syms
src/libxl/libxl_driver.c
src/lxc/lxc_driver.c
src/nodeinfo.c
src/openvz/openvz_driver.c
src/qemu/qemu_driver.c
src/test/test_driver.c
src/util/virtypedparam.c
src/util/virtypedparam.h
src/xen/xen_hypervisor.c

index d17b59314e93bb15dec08adbbc89492abb9c01e5..686a23496ca8e9a4c5e6352d0faa95717bcac7a1 100755 (executable)
@@ -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",
 }
index d5e9c2cedbda6352aed7e03c2f9911666571d5a5..a5df8103d817af7265a9179960aef95ad26f3cf2 100644 (file)
@@ -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) {
index 7c38c58077fbd80db6d95a4f05a210e44e5477c6..912a1774270dc5a0bc4b315125dd9d22538d5a62 100644 (file)
@@ -1941,9 +1941,9 @@ virTPMCreateCancelPath;
 
 
 # util/virtypedparam.h
-virTypedParameterArrayValidate;
 virTypedParameterAssign;
 virTypedParameterAssignFromStr;
+virTypedParamsValidate;
 
 
 # util/viruri.h
index 0438d3e3ca0958dcb60be9da7cbd2758a2660ee7..a311d78e527937489d4370487d318bda26b668fd 100644 (file)
@@ -4395,12 +4395,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);
index 213d2c5b91c2e844844015d05258e6cd11916172..8d02c52618bf3d82f0df1caa91140e7af3752be4 100644 (file)
@@ -818,14 +818,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);
@@ -1851,14 +1851,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);
@@ -2105,10 +2105,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);
index d8375ab117f342ee9a3393718f682213cc47468c..a50f892e41ee4a794e65b5c691d33f91ecc69206 100644 (file)
@@ -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))
index d8abe9c5b33e3fc28afa87c88de2b27a544715f6..d04e3ba9339215272464558187e5d73e878c812c 100644 (file)
@@ -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++) {
index efee62f40e15c006fc1966aa5f7b7c7234412053..dbe344cecf9782beccf22ed53461e0992f4b60a0 100644 (file)
@@ -7440,12 +7440,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)))
@@ -7774,14 +7774,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;
 
 
@@ -8059,12 +8059,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)))
@@ -8399,18 +8399,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)))
@@ -9212,20 +9212,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)))
@@ -14560,20 +14560,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));
index f1cdd9245156f1f0c5c6c00611a3121aa74e4e0e..30c21946e847de707791d21102f74a624a10ffb1 100644 (file)
@@ -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);
index bf374a656a0dc933f06442cc71db76aaba79a91d..8b2211f41ff1f91e4d5e25d6b8c48e2c98b2b974 100644 (file)
@@ -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;
index c777a5539f86bf9c618f0e957459c907afe55484..8f6bd1b83734634f0d7fe3570053fd1fce23c45c 100644 (file)
@@ -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,
index cfc8139b10ddd61f797dda5f3cae0ded9ce89f05..9d9c3eeb42e9129b39075faab67b7d14a9cdaf75 100644 (file)
@@ -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;
 
     /*