External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 00:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: rename Vcpupin to VcpuPin

Browse Source 
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.
This commit is contained in:
Eric Blake 2011-06-24 17:09:46 -06:00
parent 0a755f66d5
commit 28e45afc3f
15 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/remote.c
View File

@ -1048,13 +1048,13 @@ cleanup:
} }
static int static int
remoteDispatchDomainGetVcpupinInfo(struct qemud_server *server ATTRIBUTE_UNUSED, remoteDispatchDomainGetVcpuPinInfo(struct qemud_server *server ATTRIBUTE_UNUSED,
struct qemud_client *client ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED,
virConnectPtr conn, virConnectPtr conn,
remote_message_header *hdr ATTRIBUTE_UNUSED, remote_message_header *hdr ATTRIBUTE_UNUSED,
remote_error *rerr, remote_error *rerr,
remote_domain_get_vcpupin_info_args *args, remote_domain_get_vcpu_pin_info_args *args,
remote_domain_get_vcpupin_info_ret *ret) remote_domain_get_vcpu_pin_info_ret *ret)
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
unsigned char *cpumaps = 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) VIR_ALLOC_N(cpumaps, args->ncpumaps * args->maplen) < 0)
goto no_memory; goto no_memory;
if ((num = virDomainGetVcpupinInfo(dom, if ((num = virDomainGetVcpuPinInfo(dom,
args->ncpumaps, args->ncpumaps,
cpumaps, cpumaps,
args->maplen, args->maplen,

2
include/libvirt/libvirt.h.in
View File

@ -1266,7 +1266,7 @@ int virDomainPinVcpuFlags (virDomainPtr domain,
int maplen, int maplen,
unsigned int flags); unsigned int flags);
int virDomainGetVcpupinInfo (virDomainPtr domain, int virDomainGetVcpuPinInfo (virDomainPtr domain,
int ncpumaps, int ncpumaps,
unsigned char *cpumaps, unsigned char *cpumaps,
int maplen, int maplen,

40
src/conf/domain_conf.c
View File

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

16
src/conf/domain_conf.h
View File

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

4
src/driver.h
View File

@ -240,7 +240,7 @@ typedef int
int maplen, int maplen,
unsigned int flags); unsigned int flags);
typedef int typedef int
(*virDrvDomainGetVcpupinInfo) (virDomainPtr domain, (*virDrvDomainGetVcpuPinInfo) (virDomainPtr domain,
int ncpumaps, int ncpumaps,
unsigned char *cpumaps, unsigned char *cpumaps,
int maplen, int maplen,
@ -713,7 +713,7 @@ struct _virDriver {
virDrvDomainGetVcpusFlags domainGetVcpusFlags; virDrvDomainGetVcpusFlags domainGetVcpusFlags;
virDrvDomainPinVcpu domainPinVcpu; virDrvDomainPinVcpu domainPinVcpu;
virDrvDomainPinVcpuFlags domainPinVcpuFlags; virDrvDomainPinVcpuFlags domainPinVcpuFlags;
virDrvDomainGetVcpupinInfo domainGetVcpupinInfo; virDrvDomainGetVcpuPinInfo domainGetVcpuPinInfo;
virDrvDomainGetVcpus domainGetVcpus; virDrvDomainGetVcpus domainGetVcpus;
virDrvDomainGetMaxVcpus domainGetMaxVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus;
virDrvDomainGetSecurityLabel domainGetSecurityLabel; virDrvDomainGetSecurityLabel domainGetSecurityLabel;

12
src/libvirt.c
View File

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

8
src/libvirt_private.syms
View File

@ -366,10 +366,10 @@ virDomainTimerTickpolicyTypeFromString;
virDomainTimerTickpolicyTypeToString; virDomainTimerTickpolicyTypeToString;
virDomainTimerTrackTypeFromString; virDomainTimerTrackTypeFromString;
virDomainTimerTrackTypeToString; virDomainTimerTrackTypeToString;
virDomainVcpupinAdd; virDomainVcpuPinAdd;
virDomainVcpupinDel; virDomainVcpuPinDel;
virDomainVcpupinFindByVcpu; virDomainVcpuPinFindByVcpu;
virDomainVcpupinIsDuplicate; virDomainVcpuPinIsDuplicate;
virDomainVideoDefFree; virDomainVideoDefFree;
virDomainVideoDefaultRAM; virDomainVideoDefaultRAM;
virDomainVideoDefaultType; virDomainVideoDefaultType;

2
src/libvirt_public.syms
View File

@ -453,7 +453,7 @@ LIBVIRT_0.9.2 {
LIBVIRT_0.9.3 { LIBVIRT_0.9.3 {
global: global:
virDomainGetControlInfo; virDomainGetControlInfo;
virDomainGetVcpupinInfo; virDomainGetVcpuPinInfo;
virDomainPinVcpuFlags; virDomainPinVcpuFlags;
virDomainSendKey; virDomainSendKey;
virEventAddHandle; virEventAddHandle;

2
src/libxl/libxl_driver.c
View File

@ -2393,7 +2393,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap,
goto cleanup; goto cleanup;
} }
if (virDomainVcpupinAdd(vm->def, cpumap, maplen, vcpu) < 0) { if (virDomainVcpuPinAdd(vm->def, cpumap, maplen, vcpu) < 0) {
libxlError(VIR_ERR_INTERNAL_ERROR, libxlError(VIR_ERR_INTERNAL_ERROR,
"%s", _("failed to update or add vcpupin xml")); "%s", _("failed to update or add vcpupin xml"));
goto cleanup; goto cleanup;

14
src/qemu/qemu_driver.c
View File

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

16
src/remote/remote_driver.c
View File

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

6
src/remote/remote_protocol.x
View File

@ -903,14 +903,14 @@ struct remote_domain_pin_vcpu_flags_args {
unsigned int flags; unsigned int flags;
}; };
struct remote_domain_get_vcpupin_info_args { struct remote_domain_get_vcpu_pin_info_args {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int ncpumaps; int ncpumaps;
int maplen; int maplen;
unsigned int flags; unsigned int flags;
}; };
struct remote_domain_get_vcpupin_info_ret { struct remote_domain_get_vcpu_pin_info_ret {
opaque cpumaps<REMOTE_CPUMAPS_MAX>; opaque cpumaps<REMOTE_CPUMAPS_MAX>;
int num; int num;
}; };
@ -2392,7 +2392,7 @@ enum remote_procedure {
REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */ REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */
REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */ REMOTE_PROC_NODE_GET_MEMORY_STATS = 228, /* skipgen skipgen */
REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 229, /* autogen autogen */ 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 ? * Notice how the entries are grouped in sets of 10 ?

4
src/remote_protocol-structs
View File

@ -580,13 +580,13 @@ struct remote_domain_pin_vcpu_flags_args {
} cpumap; } cpumap;
u_int flags; u_int flags;
}; };
struct remote_domain_get_vcpupin_info_args { struct remote_domain_get_vcpu_pin_info_args {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int ncpumaps; int ncpumaps;
int maplen; int maplen;
u_int flags; u_int flags;
}; };
struct remote_domain_get_vcpupin_info_ret { struct remote_domain_get_vcpu_pin_info_ret {
struct { struct {
u_int cpumaps_len; u_int cpumaps_len;
char * cpumaps_val; char * cpumaps_val;

2
src/xen/xend_internal.c
View File

@ -2332,7 +2332,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
goto cleanup; goto cleanup;
if (ret == 0) { if (ret == 0) {
if (virDomainVcpupinAdd(def, cpumap, maplen, vcpu) < 0) { if (virDomainVcpuPinAdd(def, cpumap, maplen, vcpu) < 0) {
virXendError(VIR_ERR_INTERNAL_ERROR, virXendError(VIR_ERR_INTERNAL_ERROR,
"%s", _("failed to add vcpupin xml entry")); "%s", _("failed to add vcpupin xml entry"));
return (-1); return (-1);

10
tools/virsh.c
View File

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