Rename DomainGetIOThreadsInfo to DomainGetIOThreadInfo

While it returns info about multiple threads, the version
without the plural is easier to read.

diff --git a/daemon/remote.c b/daemon/remote.c
index e6ba68038e2d45770446e1fbd3825b4b457221ff..2e1f973b94c3cff53b7b2937706598af610cf751 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2270,12 +2270,12 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED,
 }
 
 static int
-remoteDispatchDomainGetIOThreadsInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                     virNetServerClientPtr client,
-                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                                     virNetMessageErrorPtr rerr,
-                                     remote_domain_get_iothreads_info_args *args,
-                                     remote_domain_get_iothreads_info_ret *ret)
+remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                    virNetServerClientPtr client,
+                                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                    virNetMessageErrorPtr rerr,
+                                    remote_domain_get_iothread_info_args *args,
+                                    remote_domain_get_iothread_info_ret *ret)
 {
     int rv = -1;
     size_t i;
@@ -2293,13 +2293,13 @@ remoteDispatchDomainGetIOThreadsInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
     if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
         goto cleanup;
 
-    if ((ninfo = virDomainGetIOThreadsInfo(dom, &info, args->flags)) < 0)
+    if ((ninfo = virDomainGetIOThreadInfo(dom, &info, args->flags)) < 0)
         goto cleanup;
 
-    if (ninfo > REMOTE_IOTHREADS_INFO_MAX) {
+    if (ninfo > REMOTE_IOTHREAD_INFO_MAX) {
         virReportError(VIR_ERR_RPC,
                        _("Too many IOThreads in info: %d for limit %d"),
-                       ninfo, REMOTE_IOTHREADS_INFO_MAX);
+                       ninfo, REMOTE_IOTHREAD_INFO_MAX);
         goto cleanup;
     }
 

diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 94b55b7c6886c3a6b5c85ea3ea07b3c127f3cc72..7be421942d341e498cd2d4e89798591b0f797453 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1607,7 +1607,7 @@ struct _virDomainIOThreadInfo {
 
 void                 virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info);
 
-int                  virDomainGetIOThreadsInfo(virDomainPtr domain,
+int                  virDomainGetIOThreadInfo(virDomainPtr domain,
                                                virDomainIOThreadInfoPtr **info,
                                                unsigned int flags);
 int                  virDomainPinIOThread(virDomainPtr domain,

diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index 3f9bf02ac084e15f92c2c024179837ae381d1243..1b92460011bd847c27a8ede58b7e3f16e03243a1 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -381,9 +381,9 @@ typedef int
 (*virDrvDomainGetMaxVcpus)(virDomainPtr domain);
 
 typedef int
-(*virDrvDomainGetIOThreadsInfo)(virDomainPtr domain,
-                                virDomainIOThreadInfoPtr **info,
-                                unsigned int flags);
+(*virDrvDomainGetIOThreadInfo)(virDomainPtr domain,
+                               virDomainIOThreadInfoPtr **info,
+                               unsigned int flags);
 
 typedef int
 (*virDrvDomainPinIOThread)(virDomainPtr domain,
@@ -1271,7 +1271,7 @@ struct _virHypervisorDriver {
     virDrvDomainGetEmulatorPinInfo domainGetEmulatorPinInfo;
     virDrvDomainGetVcpus domainGetVcpus;
     virDrvDomainGetMaxVcpus domainGetMaxVcpus;
-    virDrvDomainGetIOThreadsInfo domainGetIOThreadsInfo;
+    virDrvDomainGetIOThreadInfo domainGetIOThreadInfo;
     virDrvDomainPinIOThread domainPinIOThread;
     virDrvDomainGetSecurityLabel domainGetSecurityLabel;
     virDrvDomainGetSecurityLabelList domainGetSecurityLabelList;

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 73ab56dae3a709159ba5fe9b768b4362dc19c480..f1608dcc788fd9335f18e279562c864e064a59ba 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -7894,7 +7894,7 @@ virDomainGetMaxVcpus(virDomainPtr domain)
 
 
 /**
- * virDomainGetIOThreadsInfo:
+ * virDomainGetIOThreadInfo:
  * @dom: a domain object
  * @info: pointer to an array of virDomainIOThreadInfo structures (OUT)
  * @flags: bitwise-OR of virDomainModificationImpact
@@ -7910,9 +7910,9 @@ virDomainGetMaxVcpus(virDomainPtr domain)
  * then calling free() on @info. On error, @info is set to NULL.
  */
 int
-virDomainGetIOThreadsInfo(virDomainPtr dom,
-                          virDomainIOThreadInfoPtr **info,
-                          unsigned int flags)
+virDomainGetIOThreadInfo(virDomainPtr dom,
+                         virDomainIOThreadInfoPtr **info,
+                         unsigned int flags)
 {
     VIR_DOMAIN_DEBUG(dom, "info=%p flags=%x", info, flags);
 
@@ -7932,9 +7932,9 @@ virDomainGetIOThreadsInfo(virDomainPtr dom,
         goto error;
     }
 
-    if (dom->conn->driver->domainGetIOThreadsInfo) {
+    if (dom->conn->driver->domainGetIOThreadInfo) {
         int ret;
-        ret = dom->conn->driver->domainGetIOThreadsInfo(dom, info, flags);
+        ret = dom->conn->driver->domainGetIOThreadInfo(dom, info, flags);
         if (ret < 0)
             goto error;
         return ret;
@@ -7993,7 +7993,7 @@ virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info)
  * just live or both live and persistent state is changed.
  * Not all hypervisors can support all flag combinations.
  *
- * See also virDomainGetIOThreadsInfo for querying this information.
+ * See also virDomainGetIOThreadInfo for querying this information.
  *
  * Returns 0 in case of success, -1 in case of failure.
  */

diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 71639695b632bd07bca88bd6f6eee793325e993d..28347c65f7b6266aa25985469ad601f274cc4957 100644 (file)
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -698,7 +698,7 @@ LIBVIRT_1.2.12 {
 LIBVIRT_1.2.14 {
     global:
         virDomainIOThreadInfoFree;
-        virDomainGetIOThreadsInfo;
+        virDomainGetIOThreadInfo;
         virDomainPinIOThread;
         virDomainInterfaceAddresses;
         virDomainInterfaceFree;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b2597ce73178ca132ee28219ac57e66e1781fc23..db4f0b479b6ae506ade73a8aaa28880f446c42be 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5868,9 +5868,9 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
 }
 
 static int
-qemuDomainGetIOThreadsInfo(virDomainPtr dom,
-                           virDomainIOThreadInfoPtr **info,
-                           unsigned int flags)
+qemuDomainGetIOThreadInfo(virDomainPtr dom,
+                          virDomainIOThreadInfoPtr **info,
+                          unsigned int flags)
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
@@ -5884,7 +5884,7 @@ qemuDomainGetIOThreadsInfo(virDomainPtr dom,
     if (!(vm = qemuDomObjFromDomain(dom)))
         goto cleanup;
 
-    if (virDomainGetIOThreadsInfoEnsureACL(dom->conn, vm->def) < 0)
+    if (virDomainGetIOThreadInfoEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
 
     if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
@@ -19824,7 +19824,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
     .domainGetEmulatorPinInfo = qemuDomainGetEmulatorPinInfo, /* 0.10.0 */
     .domainGetVcpus = qemuDomainGetVcpus, /* 0.4.4 */
     .domainGetMaxVcpus = qemuDomainGetMaxVcpus, /* 0.4.4 */
-    .domainGetIOThreadsInfo = qemuDomainGetIOThreadsInfo, /* 1.2.14 */
+    .domainGetIOThreadInfo = qemuDomainGetIOThreadInfo, /* 1.2.14 */
     .domainPinIOThread = qemuDomainPinIOThread, /* 1.2.14 */
     .domainGetSecurityLabel = qemuDomainGetSecurityLabel, /* 0.6.1 */
     .domainGetSecurityLabelList = qemuDomainGetSecurityLabelList, /* 0.10.0 */

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 7172ada8ea50008c714a1554ed483e6ef37c3566..b275d86b99b66e7a9fb35cb87583afa901677938 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2316,15 +2316,15 @@ remoteDomainGetVcpus(virDomainPtr domain,
 }
 
 static int
-remoteDomainGetIOThreadsInfo(virDomainPtr dom,
-                             virDomainIOThreadInfoPtr **info,
-                             unsigned int flags)
+remoteDomainGetIOThreadInfo(virDomainPtr dom,
+                            virDomainIOThreadInfoPtr **info,
+                            unsigned int flags)
 {
     int rv = -1;
     size_t i;
     struct private_data *priv = dom->conn->privateData;
-    remote_domain_get_iothreads_info_args args;
-    remote_domain_get_iothreads_info_ret ret;
+    remote_domain_get_iothread_info_args args;
+    remote_domain_get_iothread_info_ret ret;
     remote_domain_iothread_info *src;
     virDomainIOThreadInfoPtr *info_ret = NULL;
 
@@ -2336,17 +2336,17 @@ remoteDomainGetIOThreadsInfo(virDomainPtr dom,
 
     memset(&ret, 0, sizeof(ret));
 
-    if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_IOTHREADS_INFO,
-             (xdrproc_t)xdr_remote_domain_get_iothreads_info_args,
+    if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_IOTHREAD_INFO,
+             (xdrproc_t)xdr_remote_domain_get_iothread_info_args,
              (char *)&args,
-             (xdrproc_t)xdr_remote_domain_get_iothreads_info_ret,
+             (xdrproc_t)xdr_remote_domain_get_iothread_info_ret,
              (char *)&ret) == -1)
         goto done;
 
-    if (ret.info.info_len > REMOTE_IOTHREADS_INFO_MAX) {
+    if (ret.info.info_len > REMOTE_IOTHREAD_INFO_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Too many IOThreads in info: %d for limit %d"),
-                       ret.info.info_len, REMOTE_IOTHREADS_INFO_MAX);
+                       ret.info.info_len, REMOTE_IOTHREAD_INFO_MAX);
         goto cleanup;
     }
 
@@ -2385,7 +2385,7 @@ remoteDomainGetIOThreadsInfo(virDomainPtr dom,
             virDomainIOThreadInfoFree(info_ret[i]);
         VIR_FREE(info_ret);
     }
-    xdr_free((xdrproc_t)xdr_remote_domain_get_iothreads_info_ret,
+    xdr_free((xdrproc_t)xdr_remote_domain_get_iothread_info_ret,
              (char *) &ret);
 
  done:
@@ -8208,7 +8208,7 @@ static virHypervisorDriver hypervisor_driver = {
     .domainGetEmulatorPinInfo = remoteDomainGetEmulatorPinInfo, /* 0.10.0 */
     .domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */
     .domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */
-    .domainGetIOThreadsInfo = remoteDomainGetIOThreadsInfo, /* 1.2.14 */
+    .domainGetIOThreadInfo = remoteDomainGetIOThreadInfo, /* 1.2.14 */
     .domainPinIOThread = remoteDomainPinIOThread, /* 1.2.14 */
     .domainGetSecurityLabel = remoteDomainGetSecurityLabel, /* 0.6.1 */
     .domainGetSecurityLabelList = remoteDomainGetSecurityLabelList, /* 0.10.0 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index eb862e1a4a6c0c260950c5498e4284abe38cb416..d90e6b5f5f57af324977cecb1b04abd4934aac58 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -86,7 +86,7 @@ const REMOTE_VCPUINFO_MAX = 16384;
 const REMOTE_CPUMAPS_MAX = 8388608;
 
 /* Upper limit on number of info fields returned by virDomainGetIOThreads. */
-const REMOTE_IOTHREADS_INFO_MAX = 16384;
+const REMOTE_IOTHREAD_INFO_MAX = 16384;
 
 /* Upper limit on migrate cookie. */
 const REMOTE_MIGRATE_COOKIE_MAX = 4194304;
@@ -1195,13 +1195,13 @@ struct remote_domain_iothread_info {
     opaque cpumap<REMOTE_CPUMAP_MAX>;
 };
 
-struct remote_domain_get_iothreads_info_args {
+struct remote_domain_get_iothread_info_args {
     remote_nonnull_domain dom;
     unsigned int flags;
 };
 
-struct remote_domain_get_iothreads_info_ret {
-    remote_domain_iothread_info info<REMOTE_IOTHREADS_INFO_MAX>;
+struct remote_domain_get_iothread_info_ret {
+    remote_domain_iothread_info info<REMOTE_IOTHREAD_INFO_MAX>;
     unsigned int ret;
 };
 
@@ -5629,7 +5629,7 @@ enum remote_procedure {
      * @generate: none
      * @acl: domain:read
      */
-    REMOTE_PROC_DOMAIN_GET_IOTHREADS_INFO = 351,
+    REMOTE_PROC_DOMAIN_GET_IOTHREAD_INFO = 351,
 
     /**
      * @generate: both

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index b3e2e40d27381e7f30cc1ef63960262595a3b377..e614f772ab0b31072245cfc433eea82467a85679 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -814,11 +814,11 @@ struct remote_domain_iothread_info {
                 char *             cpumap_val;
         } cpumap;
 };
-struct remote_domain_get_iothreads_info_args {
+struct remote_domain_get_iothread_info_args {
         remote_nonnull_domain      dom;
         u_int                      flags;
 };
-struct remote_domain_get_iothreads_info_ret {
+struct remote_domain_get_iothread_info_ret {
         struct {
                 u_int              info_len;
                 remote_domain_iothread_info * info_val;
@@ -3014,7 +3014,7 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_EVENT_CALLBACK_AGENT_LIFECYCLE = 348,
         REMOTE_PROC_DOMAIN_GET_FSINFO = 349,
         REMOTE_PROC_DOMAIN_DEFINE_XML_FLAGS = 350,
-        REMOTE_PROC_DOMAIN_GET_IOTHREADS_INFO = 351,
+        REMOTE_PROC_DOMAIN_GET_IOTHREAD_INFO = 351,
         REMOTE_PROC_DOMAIN_PIN_IOTHREAD = 352,
         REMOTE_PROC_DOMAIN_INTERFACE_ADDRESSES = 353,
 };

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index aa73d0c31ba12f746892825efafef878fd3f2477..b642d6e9b7e04919a72d417606b88f1ca526318c 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -67,7 +67,6 @@ sub fixup_name {
     $name =~ s/Fsfreeze$/FSFreeze/;
     $name =~ s/Fsthaw$/FSThaw/;
     $name =~ s/Fsinfo$/FSInfo/;
-    $name =~ s/Iothreads$/IOThreads/;
     $name =~ s/Iothread$/IOThread/;
     $name =~ s/Scsi/SCSI/;
     $name =~ s/Wwn$/WWN/;

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 79b411500a9e3f398badcbca4ec27099691bc79a..b39f4b68e3dc055d42fe3afb85afa4a3fa17c8cf 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6849,7 +6849,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd)
     if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0)
         goto cleanup;
 
-    if ((niothreads = virDomainGetIOThreadsInfo(dom, &info, flags)) < 0) {
+    if ((niothreads = virDomainGetIOThreadInfo(dom, &info, flags)) < 0) {
         vshError(ctl, _("Unable to get domain IOThreads information"));
         goto cleanup;
     }