build: rename Vcpupin to VcpuPin

We already have a public virDomainPinVcpu, which implies that
Pin and Vcpu are treated as separate words.  Unreleased commit
e261987c introduced virDomainGetVcpupinInfo as the first public
API that used Vcpupin, although we had prior internal uses of
that spelling.  For consistency, change the spelling to be two
words everywhere, regardless of whether pin comes first or last.

* daemon/remote.c: Treat vcpu and pin as separate words.
* include/libvirt/libvirt.h.in: Likewise.
* src/conf/domain_conf.c: Likewise.
* src/conf/domain_conf.h: Likewise.
* src/driver.h: Likewise.
* src/libvirt.c: Likewise.
* src/libvirt_private.syms: Likewise.
* src/libvirt_public.syms: Likewise.
* src/libxl/libxl_driver.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/remote/remote_driver.c: Likewise.
* src/xen/xend_internal.c: Likewise.
* tools/virsh.c: Likewise.
* src/remote/remote_protocol.x: Likewise.
* src/remote_protocol-structs: Likewise.
Suggested by Matthias Bolte.

diff --git a/daemon/remote.c b/daemon/remote.c
index aa726cf21155fc2d9694d84a09717675e2f1b777..56361ea80c0025bcc17ededfe13d8aab04824ef7 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1048,13 +1048,13 @@ cleanup:
 }
 
 static int
-remoteDispatchDomainGetVcpupinInfo(struct qemud_server *server ATTRIBUTE_UNUSED,
+remoteDispatchDomainGetVcpuPinInfo(struct qemud_server *server ATTRIBUTE_UNUSED,
                                    struct qemud_client *client ATTRIBUTE_UNUSED,
                                    virConnectPtr conn,
                                    remote_message_header *hdr ATTRIBUTE_UNUSED,
                                    remote_error *rerr,
-                                   remote_domain_get_vcpupin_info_args *args,
-                                   remote_domain_get_vcpupin_info_ret *ret)
+                                   remote_domain_get_vcpu_pin_info_args *args,
+                                   remote_domain_get_vcpu_pin_info_ret *ret)
 {
     virDomainPtr dom = NULL;
     unsigned char *cpumaps = NULL;
@@ -1085,7 +1085,7 @@ remoteDispatchDomainGetVcpupinInfo(struct qemud_server *server ATTRIBUTE_UNUSED,
         VIR_ALLOC_N(cpumaps, args->ncpumaps * args->maplen) < 0)
         goto no_memory;
 
-    if ((num = virDomainGetVcpupinInfo(dom,
+    if ((num = virDomainGetVcpuPinInfo(dom,
                                        args->ncpumaps,
                                        cpumaps,
                                        args->maplen,

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 4f9f158e1e6309bea4db85261e3544f08448a4c3..82e15f23a79b27a37dcde4b718522808f8fd1c7e 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1266,7 +1266,7 @@ int                     virDomainPinVcpuFlags   (virDomainPtr domain,
                                                  int maplen,
                                                  unsigned int flags);
 
-int                     virDomainGetVcpupinInfo (virDomainPtr domain,
+int                     virDomainGetVcpuPinInfo (virDomainPtr domain,
                                                  int ncpumaps,
                                                  unsigned char *cpumaps,
                                                  int maplen,

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3d290fbe30834c945ad772c946dd10e35ed507b3..60e0318a41de50242c7be16784d565c875bdf94c 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -981,7 +981,7 @@ virDomainClockDefClear(virDomainClockDefPtr def)
 }
 
 static void
-virDomainVcpupinDefFree(virDomainVcpupinDefPtr *def,
+virDomainVcpuPinDefFree(virDomainVcpuPinDefPtr *def,
                         int nvcpupin)
 {
     int i;
@@ -1089,7 +1089,7 @@ void virDomainDefFree(virDomainDefPtr def)
 
     virCPUDefFree(def->cpu);
 
-    virDomainVcpupinDefFree(def->cputune.vcpupin, def->cputune.nvcpupin);
+    virDomainVcpuPinDefFree(def->cputune.vcpupin, def->cputune.nvcpupin);
 
     VIR_FREE(def->numatune.memory.nodemask);
 
@@ -5647,13 +5647,13 @@ cleanup:
 }
 
 /* Parse the XML definition for a vcpupin */
-static virDomainVcpupinDefPtr
-virDomainVcpupinDefParseXML(const xmlNodePtr node,
+static virDomainVcpuPinDefPtr
+virDomainVcpuPinDefParseXML(const xmlNodePtr node,
                             xmlXPathContextPtr ctxt,
                             int maxvcpus,
                             int flags ATTRIBUTE_UNUSED)
 {
-    virDomainVcpupinDefPtr def;
+    virDomainVcpuPinDefPtr def;
     xmlNodePtr oldnode = ctxt->node;
     unsigned int vcpuid;
     char *tmp = NULL;
@@ -5895,13 +5895,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
     }
 
     for (i = 0 ; i < n ; i++) {
-        virDomainVcpupinDefPtr vcpupin = NULL;
-        vcpupin = virDomainVcpupinDefParseXML(nodes[i], ctxt, def->maxvcpus, 0);
+        virDomainVcpuPinDefPtr vcpupin = NULL;
+        vcpupin = virDomainVcpuPinDefParseXML(nodes[i], ctxt, def->maxvcpus, 0);
 
         if (!vcpupin)
             goto error;
 
-        if (virDomainVcpupinIsDuplicate(def->cputune.vcpupin,
+        if (virDomainVcpuPinIsDuplicate(def->cputune.vcpupin,
                                         def->cputune.nvcpupin,
                                         vcpupin->vcpuid)) {
             virDomainReportError(VIR_ERR_INTERNAL_ERROR,
@@ -8118,7 +8118,7 @@ virDomainCpuSetParse(const char **str, char sep,
 /* Check if vcpupin with same vcpuid already exists.
  * Return 1 if exists, 0 if not. */
 int
-virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def,
+virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def,
                             int nvcpupin,
                             int vcpu)
 {
@@ -8135,8 +8135,8 @@ virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def,
     return 0;
 }
 
-virDomainVcpupinDefPtr
-virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def,
+virDomainVcpuPinDefPtr
+virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def,
                            int nvcpupin,
                            int vcpu)
 {
@@ -8154,13 +8154,13 @@ virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def,
 }
 
 int
-virDomainVcpupinAdd(virDomainDefPtr def,
+virDomainVcpuPinAdd(virDomainDefPtr def,
                     unsigned char *cpumap,
                     int maplen,
                     int vcpu)
 {
-    virDomainVcpupinDefPtr *vcpupin_list = NULL;
-    virDomainVcpupinDefPtr vcpupin = NULL;
+    virDomainVcpuPinDefPtr *vcpupin_list = NULL;
+    virDomainVcpuPinDefPtr vcpupin = NULL;
     char *cpumask = NULL;
     int i;
 
@@ -8202,10 +8202,10 @@ virDomainVcpupinAdd(virDomainDefPtr def,
 
         def->cputune.vcpupin = vcpupin_list;
     } else {
-        if (virDomainVcpupinIsDuplicate(def->cputune.vcpupin,
+        if (virDomainVcpuPinIsDuplicate(def->cputune.vcpupin,
                                         def->cputune.nvcpupin,
                                         vcpu)) {
-            vcpupin = virDomainVcpupinFindByVcpu(def->cputune.vcpupin,
+            vcpupin = virDomainVcpuPinFindByVcpu(def->cputune.vcpupin,
                                                  def->cputune.nvcpupin,
                                                  vcpu);
             vcpupin->vcpuid = vcpu;
@@ -8236,11 +8236,11 @@ cleanup:
 }
 
 int
-virDomainVcpupinDel(virDomainDefPtr def, int vcpu)
+virDomainVcpuPinDel(virDomainDefPtr def, int vcpu)
 {
     int n;
     bool deleted = false;
-    virDomainVcpupinDefPtr *vcpupin_list = def->cputune.vcpupin;
+    virDomainVcpuPinDefPtr *vcpupin_list = def->cputune.vcpupin;
 
     /* No vcpupin exists yet */
     if (!def->cputune.nvcpupin) {
@@ -8253,7 +8253,7 @@ virDomainVcpupinDel(virDomainDefPtr def, int vcpu)
             VIR_FREE(vcpupin_list[n]);
             memmove(&vcpupin_list[n],
                     &vcpupin_list[n+1],
-                    (def->cputune.nvcpupin - n - 1) * sizeof(virDomainVcpupinDef *));
+                    (def->cputune.nvcpupin - n - 1) * sizeof(virDomainVcpuPinDef *));
             deleted = true;
             break;
         }
@@ -8263,7 +8263,7 @@ virDomainVcpupinDel(virDomainDefPtr def, int vcpu)
         return 0;
 
     if (--def->cputune.nvcpupin == 0) {
-        virDomainVcpupinDefFree(def->cputune.vcpupin, 0);
+        virDomainVcpuPinDefFree(def->cputune.vcpupin, 0);
     } else {
         if (VIR_REALLOC_N(def->cputune.vcpupin, def->cputune.nvcpupin) < 0) {
             virReportOOMError();

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index aa25e3679eded620f07d7607fd58736fa3d6b9bd..e81977c61a341bb0f51eefd50483f63dfc446532 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1101,18 +1101,18 @@ void virDomainSnapshotObjListRemove(virDomainSnapshotObjListPtr snapshots,
 int virDomainSnapshotHasChildren(virDomainSnapshotObjPtr snap,
                                 virDomainSnapshotObjListPtr snapshots);
 
-typedef struct _virDomainVcpupinDef virDomainVcpupinDef;
-typedef virDomainVcpupinDef *virDomainVcpupinDefPtr;
-struct _virDomainVcpupinDef {
+typedef struct _virDomainVcpuPinDef virDomainVcpuPinDef;
+typedef virDomainVcpuPinDef *virDomainVcpuPinDefPtr;
+struct _virDomainVcpuPinDef {
     int vcpuid;
     char *cpumask;
 };
 
-int virDomainVcpupinIsDuplicate(virDomainVcpupinDefPtr *def,
+int virDomainVcpuPinIsDuplicate(virDomainVcpuPinDefPtr *def,
                                 int nvcpupin,
                                 int vcpu);
 
-virDomainVcpupinDefPtr virDomainVcpupinFindByVcpu(virDomainVcpupinDefPtr *def,
+virDomainVcpuPinDefPtr virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def,
                                                   int nvcpupin,
                                                   int vcpu);
 
@@ -1171,7 +1171,7 @@ struct _virDomainDef {
     struct {
         unsigned long shares;
         int nvcpupin;
-        virDomainVcpupinDefPtr *vcpupin;
+        virDomainVcpuPinDefPtr *vcpupin;
     } cputune;
 
     virDomainNumatuneDef numatune;
@@ -1406,12 +1406,12 @@ int virDomainCpuSetParse(const char **str,
 char *virDomainCpuSetFormat(char *cpuset,
                             int maxcpu);
 
-int virDomainVcpupinAdd(virDomainDefPtr def,
+int virDomainVcpuPinAdd(virDomainDefPtr def,
                         unsigned char *cpumap,
                         int maplen,
                         int vcpu);
 
-int virDomainVcpupinDel(virDomainDefPtr def, int vcpu);
+int virDomainVcpuPinDel(virDomainDefPtr def, int vcpu);
 
 int virDomainDiskIndexByName(virDomainDefPtr def, const char *name);
 int virDomainDiskInsert(virDomainDefPtr def,

diff --git a/src/driver.h b/src/driver.h
index c15d0dd33e29cacdcbc825313e0b31c71cdbf2dd..60cd556ddd433cb97cea72ada36b4723ca69d4c5 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -240,7 +240,7 @@ typedef int
                                          int maplen,
                                          unsigned int flags);
 typedef int
-        (*virDrvDomainGetVcpupinInfo)   (virDomainPtr domain,
+        (*virDrvDomainGetVcpuPinInfo)   (virDomainPtr domain,
                                          int ncpumaps,
                                          unsigned char *cpumaps,
                                          int maplen,
@@ -713,7 +713,7 @@ struct _virDriver {
     virDrvDomainGetVcpusFlags          domainGetVcpusFlags;
     virDrvDomainPinVcpu                domainPinVcpu;
     virDrvDomainPinVcpuFlags    domainPinVcpuFlags;
-    virDrvDomainGetVcpupinInfo  domainGetVcpupinInfo;
+    virDrvDomainGetVcpuPinInfo  domainGetVcpuPinInfo;
     virDrvDomainGetVcpus               domainGetVcpus;
     virDrvDomainGetMaxVcpus            domainGetMaxVcpus;
     virDrvDomainGetSecurityLabel     domainGetSecurityLabel;

diff --git a/src/libvirt.c b/src/libvirt.c
index 46a448b26039a8f62d802dc4337461fb7f4cd310..a3f32677dab6edbd5a9535935ae5228fe2cbfeda 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -7061,7 +7061,7 @@ error:
  * just live or both live and persistent state is changed.
  * Not all hypervisors can support all flag combinations.
  *
- * See also virDomainGetVcpupinInfo for querying this information.
+ * See also virDomainGetVcpuPinInfo for querying this information.
  *
  * Returns 0 in case of success, -1 in case of failure.
  *
@@ -7112,7 +7112,7 @@ error:
 }
 
 /**
- * virDomainGetVcpupinInfo:
+ * virDomainGetVcpuPinInfo:
  * @domain: pointer to domain object, or NULL for Domain0
  * @ncpumaps: the number of cpumap (listed first to match virDomainGetVcpus)
  * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this
@@ -7136,7 +7136,7 @@ error:
  * -1 in case of failure.
  */
 int
-virDomainGetVcpupinInfo (virDomainPtr domain, int ncpumaps,
+virDomainGetVcpuPinInfo (virDomainPtr domain, int ncpumaps,
                          unsigned char *cpumaps, int maplen, unsigned int flags)
 {
     virConnectPtr conn;
@@ -7160,9 +7160,9 @@ virDomainGetVcpupinInfo (virDomainPtr domain, int ncpumaps,
 
     conn = domain->conn;
 
-    if (conn->driver->domainGetVcpupinInfo) {
+    if (conn->driver->domainGetVcpuPinInfo) {
         int ret;
-        ret = conn->driver->domainGetVcpupinInfo (domain, ncpumaps,
+        ret = conn->driver->domainGetVcpuPinInfo (domain, ncpumaps,
                                                   cpumaps, maplen, flags);
         if (ret < 0)
             goto error;
@@ -7197,7 +7197,7 @@ error:
  * and also in cpumaps if this pointer isn't NULL.  This call may fail
  * on an inactive domain.
  *
- * See also virDomainGetVcpupinInfo for querying just cpumaps, including on
+ * See also virDomainGetVcpuPinInfo for querying just cpumaps, including on
  * an inactive domain.
  *
  * Returns the number of info filled in case of success, -1 in case of failure.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index afe9835ca636191554971e885adddda97610fbd4..054c0749d239ab1a56f376a54c9080c3b033192e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -366,10 +366,10 @@ virDomainTimerTickpolicyTypeFromString;
 virDomainTimerTickpolicyTypeToString;
 virDomainTimerTrackTypeFromString;
 virDomainTimerTrackTypeToString;
-virDomainVcpupinAdd;
-virDomainVcpupinDel;
-virDomainVcpupinFindByVcpu;
-virDomainVcpupinIsDuplicate;
+virDomainVcpuPinAdd;
+virDomainVcpuPinDel;
+virDomainVcpuPinFindByVcpu;
+virDomainVcpuPinIsDuplicate;
 virDomainVideoDefFree;
 virDomainVideoDefaultRAM;
 virDomainVideoDefaultType;

diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index c7dc3c533b08b263bd42a21b3177f03af8e07670..5f2541a214d0346749093a8cc7adf44965ae3292 100644 (file)
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -453,7 +453,7 @@ LIBVIRT_0.9.2 {
 LIBVIRT_0.9.3 {
     global:
         virDomainGetControlInfo;
-        virDomainGetVcpupinInfo;
+        virDomainGetVcpuPinInfo;
         virDomainPinVcpuFlags;
         virDomainSendKey;
         virEventAddHandle;

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 5a5951fa7fa609bcf904caf30be5d32e5b18acb4..7fd257d43c7671e0ff335bdd616dc7ccd802c15b 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2393,7 +2393,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap,
         goto cleanup;
     }
 
-    if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
+    if (virDomainVcpuPinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
         libxlError(VIR_ERR_INTERNAL_ERROR,
                    "%s", _("failed to update or add vcpupin xml"));
         goto cleanup;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index da612e73f3202ee5a766ded024ee4e732aea62a6..8fcc266f9a04e953e9ba823d95345cc0397fbac6 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3109,14 +3109,14 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
         }
 
         if (canResetting) {
-            if (virDomainVcpupinDel(vm->def, vcpu) < 0) {
+            if (virDomainVcpuPinDel(vm->def, vcpu) < 0) {
                 qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                 _("failed to delete vcpupin xml of "
                                   "a running domain"));
                 goto cleanup;
             }
         } else {
-            if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
+            if (virDomainVcpuPinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
                 qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                 _("failed to update or add vcpupin xml of "
                                   "a running domain"));
@@ -3129,14 +3129,14 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
     if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
 
         if (canResetting) {
-            if (virDomainVcpupinDel(persistentDef, vcpu) < 0) {
+            if (virDomainVcpuPinDel(persistentDef, vcpu) < 0) {
                 qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                 _("failed to delete vcpupin xml of "
                                   "a persistent domain"));
                 goto cleanup;
             }
         } else {
-            if (virDomainVcpupinAdd(persistentDef, cpumap, maplen, vcpu) < 0) {
+            if (virDomainVcpuPinAdd(persistentDef, cpumap, maplen, vcpu) < 0) {
                 qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                 _("failed to update or add vcpupin xml of "
                                   "a persistent domain"));
@@ -3166,7 +3166,7 @@ qemudDomainPinVcpu(virDomainPtr dom,
 }
 
 static int
-qemudDomainGetVcpupinInfo(virDomainPtr dom,
+qemudDomainGetVcpuPinInfo(virDomainPtr dom,
                           int ncpumaps,
                           unsigned char *cpumaps,
                           int maplen,
@@ -3180,7 +3180,7 @@ qemudDomainGetVcpupinInfo(virDomainPtr dom,
     bool isActive;
     int maxcpu, hostcpus, vcpu, pcpu;
     int n;
-    virDomainVcpupinDefPtr *vcpupin_list;
+    virDomainVcpuPinDefPtr *vcpupin_list;
     char *cpumask = NULL;
     unsigned char *cpumap;
 
@@ -8446,7 +8446,7 @@ static virDriver qemuDriver = {
     .domainGetVcpusFlags = qemudDomainGetVcpusFlags, /* 0.8.5 */
     .domainPinVcpu = qemudDomainPinVcpu, /* 0.4.4 */
     .domainPinVcpuFlags = qemudDomainPinVcpuFlags, /* 0.9.3 */
-    .domainGetVcpupinInfo = qemudDomainGetVcpupinInfo, /* 0.9.3 */
+    .domainGetVcpuPinInfo = qemudDomainGetVcpuPinInfo, /* 0.9.3 */
     .domainGetVcpus = qemudDomainGetVcpus, /* 0.4.4 */
     .domainGetMaxVcpus = qemudDomainGetMaxVcpus, /* 0.4.4 */
     .domainGetSecurityLabel = qemudDomainGetSecurityLabel, /* 0.6.1 */

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 84a5eab4acbfa345659350b22584cbc3fa543ec6..ac0012897ca7aa098b939bd8e55f787130ead37f 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2142,7 +2142,7 @@ done:
 }
 
 static int
-remoteDomainGetVcpupinInfo (virDomainPtr domain,
+remoteDomainGetVcpuPinInfo (virDomainPtr domain,
                             int ncpumaps,
                             unsigned char *cpumaps,
                             int maplen,
@@ -2150,8 +2150,8 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain,
 {
     int rv = -1;
     int i;
-    remote_domain_get_vcpupin_info_args args;
-    remote_domain_get_vcpupin_info_ret ret;
+    remote_domain_get_vcpu_pin_info_args args;
+    remote_domain_get_vcpu_pin_info_ret ret;
     struct private_data *priv = domain->conn->privateData;
 
     remoteDriverLock(priv);
@@ -2178,10 +2178,10 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain,
 
     memset (&ret, 0, sizeof ret);
 
-    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPUPIN_INFO,
-              (xdrproc_t) xdr_remote_domain_get_vcpupin_info_args,
+    if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO,
+              (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_args,
               (char *) &args,
-              (xdrproc_t) xdr_remote_domain_get_vcpupin_info_ret,
+              (xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret,
               (char *) &ret) == -1)
         goto done;
 
@@ -2207,7 +2207,7 @@ remoteDomainGetVcpupinInfo (virDomainPtr domain,
     rv = ret.num;
 
 cleanup:
-    xdr_free ((xdrproc_t) xdr_remote_domain_get_vcpupin_info_ret, (char *) &ret);
+    xdr_free ((xdrproc_t) xdr_remote_domain_get_vcpu_pin_info_ret, (char *) &ret);
 
 done:
     remoteDriverUnlock(priv);
@@ -6465,7 +6465,7 @@ static virDriver remote_driver = {
     .domainGetVcpusFlags = remoteDomainGetVcpusFlags, /* 0.8.5 */
     .domainPinVcpu = remoteDomainPinVcpu, /* 0.3.0 */
     .domainPinVcpuFlags = remoteDomainPinVcpuFlags, /* 0.9.3 */
-    .domainGetVcpupinInfo = remoteDomainGetVcpupinInfo, /* 0.9.3 */
+    .domainGetVcpuPinInfo = remoteDomainGetVcpuPinInfo, /* 0.9.3 */
     .domainGetVcpus = remoteDomainGetVcpus, /* 0.3.0 */
     .domainGetMaxVcpus = remoteDomainGetMaxVcpus, /* 0.3.0 */
     .domainGetSecurityLabel = remoteDomainGetSecurityLabel, /* 0.6.1 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index ee08b825ad43cdbda06e6657f6bcd3346ffeb56e..65a4432090ae651b81e9c048fafd51b5f9364d28 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -903,14 +903,14 @@ struct remote_domain_pin_vcpu_flags_args {
     unsigned int flags;
 };
 
-struct remote_domain_get_vcpupin_info_args {
+struct remote_domain_get_vcpu_pin_info_args {
     remote_nonnull_domain dom;
     int ncpumaps;
     int maplen;
     unsigned int flags;
 };
 
-struct remote_domain_get_vcpupin_info_ret {
+struct remote_domain_get_vcpu_pin_info_ret {
     opaque cpumaps<REMOTE_CPUMAPS_MAX>;
     int num;
 };
@@ -2392,7 +2392,7 @@ enum remote_procedure {
     REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */
     REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */
     REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229, /* autogen autogen */
-    REMOTE_PROC_DOMAIN_GET_VCPUPIN_INFO = 230  /* skipgen skipgen */
+    REMOTE_PROC_DOMAIN_GET_VCPU_PIN_INFO = 230  /* skipgen skipgen */
 
     /*
      * Notice how the entries are grouped in sets of 10 ?

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index be98135ae6d3926880394b0d2d8c3be0e2e662ae..c07ba81cb72f7b3ad506d5fecef69962ca226b5b 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -580,13 +580,13 @@ struct remote_domain_pin_vcpu_flags_args {
         } cpumap;
         u_int                      flags;
 };
-struct remote_domain_get_vcpupin_info_args {
+struct remote_domain_get_vcpu_pin_info_args {
         remote_nonnull_domain      dom;
         int                        ncpumaps;
         int                        maplen;
         u_int                      flags;
 };
-struct remote_domain_get_vcpupin_info_ret {
+struct remote_domain_get_vcpu_pin_info_ret {
         struct {
                 u_int              cpumaps_len;
                 char *             cpumaps_val;

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index f94dd8bf7f713e6080de316ffd6da6d3528db4e7..d41884755a8dfc002a2c76f572b5bc7415d0303d 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2332,7 +2332,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
         goto cleanup;
 
     if (ret == 0) {
-        if (virDomainVcpupinAdd(def, cpumap, maplen, vcpu) < 0) {
+        if (virDomainVcpuPinAdd(def, cpumap, maplen, vcpu) < 0) {
             virXendError(VIR_ERR_INTERNAL_ERROR,
                          "%s", _("failed to add vcpupin xml entry"));
             return (-1);

diff --git a/tools/virsh.c b/tools/virsh.c
index 31fbeb78701ec0cd8983d6dd36f19dee04c9a356..8e6439f27850790f09e29661f0e71d0b407fb2ca 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -2962,11 +2962,11 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
         }
     } else {
         if (info.state == VIR_DOMAIN_SHUTOFF &&
-            (ncpus = virDomainGetVcpupinInfo(dom, info.nrVirtCpu,
+            (ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu,
                                              cpumaps, cpumaplen,
                                              VIR_DOMAIN_AFFECT_CONFIG)) >= 0) {
 
-            /* fallback plan to use virDomainGetVcpupinInfo */
+            /* fallback plan to use virDomainGetVcpuPinInfo */
 
             for (n = 0; n < ncpus; n++) {
                 vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n);
@@ -3015,7 +3015,7 @@ static const vshCmdOptDef opts_vcpupin[] = {
 };
 
 static bool
-cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
+cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
 {
     virDomainInfo info;
     virDomainPtr dom;
@@ -3101,7 +3101,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
             flags = VIR_DOMAIN_AFFECT_CURRENT;
 
         cpumaps = vshMalloc(ctl, info.nrVirtCpu * cpumaplen);
-        if ((ncpus = virDomainGetVcpupinInfo(dom, info.nrVirtCpu,
+        if ((ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu,
                                              cpumaps, cpumaplen, flags)) >= 0) {
 
             vshPrint(ctl, "%s %s\n", _("VCPU:"), _("CPU Affinity"));
@@ -11674,7 +11674,7 @@ static const vshCmdDef domManagementCmds[] = {
      info_update_device, 0},
     {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0},
     {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0},
-    {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0},
+    {"vcpupin", cmdVcpuPin, opts_vcpupin, info_vcpupin, 0},
     {"version", cmdVersion, opts_version, info_version, 0},
     {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0},
     {NULL, NULL, NULL, NULL, 0}