- Devel - libvirt List Archives

[libvirt] [PATCH] build: Don't expect translatable strings in a dead file
by Jiri Denemark 28 Jun '11

28 Jun '11

daemon/remote_dispatch_bodies.h is no longer with us and shouldn't be searched for translatable strings. --- Pushed under the build-breaker rule. po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index a81fc55..1f226fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ daemon/libvirtd.c daemon/remote.c -daemon/remote_dispatch_bodies.h daemon/stream.c gnulib/lib/gai_strerror.c src/conf/cpu_conf.c -- 1.7.6

2 1

[libvirt] [PATCH] daemon: Fix build without polkit
by Jiri Denemark 28 Jun '11

28 Jun '11

--- Pushed under the build-breaker rule. daemon/libvirtd.c | 10 +++++----- daemon/remote.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 62f089d..d1f80e4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -874,7 +874,7 @@ static void daemonConfigFree(struct daemonConfig *data); static struct daemonConfig* -daemonConfigNew(bool privileged) +daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) { struct daemonConfig *data; char *localhost; @@ -1034,8 +1034,10 @@ daemonConfigLoad(struct daemonConfig *data, */ if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) { VIR_FREE(data->unix_sock_rw_perms); - if (!(data->unix_sock_rw_perms = strdup("0777"))) - goto no_memory; + if (!(data->unix_sock_rw_perms = strdup("0777"))) { + virReportOOMError(); + goto error; + } } #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0) @@ -1091,8 +1093,6 @@ daemonConfigLoad(struct daemonConfig *data, virConfFree (conf); return 0; -no_memory: - virReportOOMError(); error: virConfFree (conf); return -1; diff --git a/daemon/remote.c b/daemon/remote.c index 47e47e4..9547702 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2209,7 +2209,7 @@ authdeny: static int remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, + virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) -- 1.7.6

1 0

[libvirt] [PATCH] remote: fix uninitialized variable
by Eric Blake 28 Jun '11

28 Jun '11

Detected by gcc -O2: remote/remote_driver.c: In function 'doRemoteOpen': remote/remote_driver.c:2753:26: error: 'sasl' may be used uninitialized in this function [-Werror=uninitialized] * src/remote/remote_driver.c (remoteAuthSASL): Initialize sasl. --- Pushing under the build-breaker rule. src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2ac87c8..0e68bc5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2520,7 +2520,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int ret = -1; const char *mechlist; virNetSASLContextPtr saslCtxt; - virNetSASLSessionPtr sasl; + virNetSASLSessionPtr sasl = NULL; VIR_DEBUG("Client initialize SASL authentication"); -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make check' when pdwtags is available
by Eric Blake 28 Jun '11

28 Jun '11

Problem introduced in commit 6818cf86. * src/remote_protocol-structs: Delete unused struct. --- Pushing under the build-breaker rule. Normally, deleting a struct from remote_protocol-structs is a sign of an over-the-wire API breakage; but in this case, I've verified that the new RPC code manages to represent the same over-the-wire layout without needing this header struct. src/remote_protocol-structs | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index c07ba81..25979b4 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1615,11 +1615,3 @@ struct remote_domain_get_control_info_ret { u_int details; uint64_t stateTime; }; -struct remote_message_header { - u_int prog; - u_int vers; - int proc; - remote_message_type type; - u_int serial; - remote_message_status status; -}; -- 1.7.4.4

1 0

[libvirt] [PATCH 0/3] Improve flexibility of SELinux labelling
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch series adds two new features - The ability to override 'system_u:system_r:svirt_t:s0' from /etc/selinux/targeted/contexts/virtual_domain_context using the guest XML - The ability to use dynamic relabelling of resources, in combo with static VM label assignment. The latter is useful for management applications which want to be in full control of assigning VM labels (so that they can be unique across an entire cluster of hosts for example), while still benefiting from automatic relabelling of resources in the XML.

3 10

[libvirt] [PATCH 0/4 v2] Automatic lease management for sanlock
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This is an update to http://www.redhat.com/archives/libvir-list/2011-June/msg00813.html Changed in this v2 posting - Incorporated feedback from v1 - Removed the cron job. This should be manually setup by the admin on only one host - Added documentation to the website on how to deploy sanlock

2 11

[libvirt] [PATCH] network: add domain to unqalified names define with <host>
by Laine Stump 28 Jun '11

28 Jun '11

If a domain name is defined for a network, add the --expand-hosts option to the dnsmasq commandline. This results in the domain being added to any hostname that is defined in a dns <host> element and contains no '.' characters (i.e. it is an "unqualified" hostname). Since PTR records are automatically created for any name define in <host>, the result of a PTR request will change from the unqualified name to the qualified name. This also has the same effect on any hostnames that dnsmasq reads from the host's /etc/hosts file. Hosts. I want to make sure that everyone notices that previous paragraph and has a chance to object if they believe this change in existing behavior will be detrimental. Note that guests will still be able to query the unqualified name, with the same results as before; it is only when a reverse lookup of an IP address is done that the result will be different, e.g. it will return "f15.example.com" instead of "f15". (In the case of guest hostnames that were learned by dnsmasq via DHCP requests, they were already getting the domain name added on, even without --expand-hosts). --- src/network/bridge_driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f15a7a6..a9a0374 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,6 +614,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); + /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts file */ + if (network->def->domain) + virCommandAddArg(cmd, "--expand-hosts"); + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", -- 1.7.3.4

2 2

[libvirt] [PATCH 0/4] Switch over to use the new RPC code
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch set actually switches the libvirtd daemon and remote driver client code to use the new RPC code. While it has had a fair amount of testing, it has also been rebased many many many times. There are bound to be things in it which break, hopefully not the actual RPC wire data format, but in the client/daemon dispatch code and thread safety, etc ....

3 16

[libvirt] [PATCH 0/8 v2] Enable libvirt to attach to existing QEMU instances
by Daniel P. Berrange 28 Jun '11

28 Jun '11

An update of http://www.redhat.com/archives/libvir-list/2011-May/msg00223.html New in this series: - Split the patch up into more pieces for easier review - Add tainting of the attached process - Correctly handle removal of pidfile for attachde process - Wire up PCI address detection - Add virsh documentation

2 10

[libvirt] [PATCH] Add node prefix to virNodeGet(CPU|Memory)Stats structs and defines
by Matthias Bolte 28 Jun '11

28 Jun '11

--- daemon/remote.c | 4 +- include/libvirt/libvirt.h.in | 99 ++++++++++++++++++++---------------------- src/driver.h | 4 +- src/libvirt.c | 38 ++++++++-------- src/nodeinfo.c | 40 ++++++++-------- src/nodeinfo.h | 4 +- src/remote/remote_driver.c | 4 +- tools/virsh.c | 18 ++++---- 8 files changed, 103 insertions(+), 108 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1914b25..180fefa 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1557,7 +1557,7 @@ remoteDispatchNodeGetCPUStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_cpu_stats_args *args, remote_node_get_cpu_stats_ret *ret) { - virCPUStatsPtr params = NULL; + virNodeCPUStatsPtr params = NULL; int i; int cpuNum = args->cpuNum; int nparams = args->nparams; @@ -1634,7 +1634,7 @@ remoteDispatchNodeGetMemoryStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_memory_stats_args *args, remote_node_get_memory_stats_ret *ret) { - virMemoryStatsPtr params = NULL; + virNodeMemoryStatsPtr params = NULL; int i; int cellNum = args->cellNum; int nparams = args->nparams; diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cf1a682..f029d69 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -302,135 +302,130 @@ struct _virNodeInfo { }; /** - * VIR_CPU_STATS_FIELD_LENGTH: + * VIR_NODE_CPU_STATS_FIELD_LENGTH: * * Macro providing the field length of virNodeCPUStats */ -#define VIR_CPU_STATS_FIELD_LENGTH 80 +#define VIR_NODE_CPU_STATS_FIELD_LENGTH 80 /** - * VIR_CPU_STATS_ALL_CPUS: + * VIR_NODE_CPU_STATS_ALL_CPUS: * * Macro for the total CPU time/utilization */ -#define VIR_CPU_STATS_ALL_CPUS (-1) +#define VIR_NODE_CPU_STATS_ALL_CPUS (-1) /** - * VIR_CPU_STATS_KERNEL: + * VIR_NODE_CPU_STATS_KERNEL: * * Macro for the cumulative CPU time which was spend by kernel, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_KERNEL "kernel" +#define VIR_NODE_CPU_STATS_KERNEL "kernel" /** - * VIR_CPU_STATS_USER: + * VIR_NODE_CPU_STATS_USER: * * The cumulative CPU time which was spend by user processes, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_USER "user" +#define VIR_NODE_CPU_STATS_USER "user" /** - * VIR_CPU_STATS_IDLE: + * VIR_NODE_CPU_STATS_IDLE: * * The cumulative idle CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IDLE "idle" +#define VIR_NODE_CPU_STATS_IDLE "idle" /** - * VIR_CPU_STATS_IOWAIT: + * VIR_NODE_CPU_STATS_IOWAIT: * * The cumulative I/O wait CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IOWAIT "iowait" +#define VIR_NODE_CPU_STATS_IOWAIT "iowait" /** - * VIR_CPU_STATS_UTILIZATION: + * VIR_NODE_CPU_STATS_UTILIZATION: * * The CPU utilization of a node. * The usage value is in percent and 100% represents all CPUs of * the node. */ -#define VIR_CPU_STATS_UTILIZATION "utilization" +#define VIR_NODE_CPU_STATS_UTILIZATION "utilization" /** - * virCPUStats: + * virNodeCPUStats: * * a virNodeCPUStats is a structure filled by virNodeGetCPUStats() * providing information about the CPU stats of the node. */ -typedef struct _virCPUStats virCPUStats; +typedef struct _virNodeCPUStats virNodeCPUStats; -struct _virCPUStats { - char field[VIR_CPU_STATS_FIELD_LENGTH]; +struct _virNodeCPUStats { + char field[VIR_NODE_CPU_STATS_FIELD_LENGTH]; unsigned long long value; }; /** - * VIR_MEMORY_STATS_FIELD_LENGTH: + * VIR_NODE_MEMORY_STATS_FIELD_LENGTH: * - * Macro providing the field length of virMemoryStats + * Macro providing the field length of virNodeMemoryStats */ -#define VIR_MEMORY_STATS_FIELD_LENGTH 80 +#define VIR_NODE_MEMORY_STATS_FIELD_LENGTH 80 /** - * VIR_MEMORY_STATS_ALL_CELLS: + * VIR_NODE_MEMORY_STATS_ALL_CELLS: * * Macro for the total memory of all cells. */ -#define VIR_MEMORY_STATS_ALL_CELLS (-1) +#define VIR_NODE_MEMORY_STATS_ALL_CELLS (-1) /** - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * * Macro for the total memory of specified cell: * it represents the maximum memory. */ - -#define VIR_MEMORY_STATS_TOTAL "total" +#define VIR_NODE_MEMORY_STATS_TOTAL "total" /** - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * * Macro for the free memory of specified cell: * On Linux, it includes buffer and cached memory, in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_FREE "free" +#define VIR_NODE_MEMORY_STATS_FREE "free" /** - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * * Macro for the buffer memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_BUFFERS "buffers" +#define VIR_NODE_MEMORY_STATS_BUFFERS "buffers" /** - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * * Macro for the cached memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_CACHED "cached" +#define VIR_NODE_MEMORY_STATS_CACHED "cached" /** - * virMemoryStats: + * virNodeMemoryStats: * - * a virMemoryStats is a structure filled by virNodeGetMemoryStats() + * a virNodeMemoryStats is a structure filled by virNodeGetMemoryStats() * providing information about the memory of the node. */ +typedef struct _virNodeMemoryStats virNodeMemoryStats; -typedef struct _virMemoryStats virMemoryStats; - -struct _virMemoryStats { - char field[VIR_MEMORY_STATS_FIELD_LENGTH]; +struct _virNodeMemoryStats { + char field[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long long value; }; @@ -693,20 +688,20 @@ int virDomainMigrateSetMaxSpeed(virDomainPtr domain, typedef virNodeInfo *virNodeInfoPtr; /** - * virCPUStatsPtr: + * virNodeCPUStatsPtr: * - * a virCPUStatsPtr is a pointer to a virCPUStats structure. + * a virNodeCPUStatsPtr is a pointer to a virNodeCPUStats structure. */ -typedef virCPUStats *virCPUStatsPtr; +typedef virNodeCPUStats *virNodeCPUStatsPtr; /** - * virMemoryStatsPtr: + * virNodeMemoryStatsPtr: * - * a virMemoryStatsPtr is a pointer to a virMemoryStats structure. + * a virNodeMemoryStatsPtr is a pointer to a virNodeMemoryStats structure. */ -typedef virMemoryStats *virMemoryStatsPtr; +typedef virNodeMemoryStats *virNodeMemoryStatsPtr; /** * virConnectFlags @@ -844,13 +839,13 @@ char * virConnectGetCapabilities (virConnectPtr conn); int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index d45575a..5fd2433 100644 --- a/src/driver.h +++ b/src/driver.h @@ -380,7 +380,7 @@ typedef int (*virDrvNodeGetCPUStats) (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); @@ -388,7 +388,7 @@ typedef int (*virDrvNodeGetMemoryStats) (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/libvirt.c b/src/libvirt.c index 36a90d1..1f4730d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5287,7 +5287,7 @@ error: /** * virNodeGetCPUStats: * @conn: pointer to the hypervisor connection. - * @cpuNum: number of node cpu. (VIR_CPU_STATS_ALL_CPUS means total cpu + * @cpuNum: number of node cpu. (VIR_NODE_CPU_STATS_ALL_CPUS means total cpu * statistics) * @params: pointer to node cpu time parameter objects * @nparams: number of node cpu time parameter (this value should be same or @@ -5296,23 +5296,23 @@ error: * * This function provides individual cpu statistics of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_CPU_STATS_ALL_CPUS to @cpuNum. + * VIR_NODE_CPU_STATS_ALL_CPUS to @cpuNum. * The @params array will be filled with the values equal to the number of * parameters suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virCPUStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeCPUStats) * @nparams) bytes and call * the API again. * * Here is a sample code snippet: * * if ((virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virCPUStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) * goto error; - * memset(params, 0, sizeof(virCPUStats) * nparams); + * memset(params, 0, sizeof(virNodeCPUStats) * nparams); * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) * goto error; * } @@ -5340,7 +5340,7 @@ error: */ int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%u", @@ -5355,7 +5355,7 @@ int virNodeGetCPUStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cpuNum < 0) && (cpuNum != VIR_CPU_STATS_ALL_CPUS))) { + ((cpuNum < 0) && (cpuNum != VIR_NODE_CPU_STATS_ALL_CPUS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -5377,8 +5377,8 @@ error: /** * virNodeGetMemoryStats: * @conn: pointer to the hypervisor connection. - * @cellNum: number of node cell. (VIR_MEMORY_STATS_ALL_CELLS means total cell - * statistics) + * @cellNum: number of node cell. (VIR_NODE_MEMORY_STATS_ALL_CELLS means total + * cell statistics) * @params: pointer to node memory stats objects * @nparams: number of node memory stats (this value should be same or * less than the number of stats supported) @@ -5386,23 +5386,23 @@ error: * * This function provides memory stats of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_MEMORY_STATS_ALL_CELLS to @cellNum. + * VIR_NODE_MEMORY_STATS_ALL_CELLS to @cellNum. * The @params array will be filled with the values equal to the number of * stats suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virMemoryStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeMemoryStats) * @nparams) bytes and call * the API again. * * Here is the sample code snippet: * * if ((virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virMemoryStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) * goto error; - * memset(params, cellNum, 0, sizeof(virMemoryStats) * nparams); + * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) * goto error; * } @@ -5412,21 +5412,21 @@ error: * * Memory Stats: * - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * The total memory usage.(KB) - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * The free memory usage.(KB) * On linux, this usage includes buffers and cached. - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * The buffers memory usage.(KB) - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * The cached memory usage.(KB) * * Returns -1 in case of error, 0 in case of success. */ int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%u", @@ -5441,7 +5441,7 @@ int virNodeGetMemoryStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cellNum < 0) && (cellNum != VIR_MEMORY_STATS_ALL_CELLS))) { + ((cellNum < 0) && (cellNum != VIR_NODE_MEMORY_STATS_ALL_CELLS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index cb2f805..4620d93 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -72,11 +72,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, static int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams); static int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams); /* Return the positive decimal contents of the given @@ -396,7 +396,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams) { int ret = -1; @@ -418,7 +418,7 @@ int linuxNodeGetCPUStats(FILE *procstat, goto cleanup; } - if (cpuNum == VIR_CPU_STATS_ALL_CPUS) { + if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { strcpy(cpu_header, "cpu"); } else { snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); @@ -439,11 +439,11 @@ int linuxNodeGetCPUStats(FILE *procstat, } for (i = 0; i < *nparams; i++) { - virCPUStatsPtr param = &params[i]; + virNodeCPUStatsPtr param = &params[i]; switch (i) { case 0: /* fill kernel cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_KERNEL) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_KERNEL) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -452,7 +452,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 1: /* fill user cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_USER) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_USER) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -461,7 +461,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 2: /* fill idle cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IDLE) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IDLE) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -470,7 +470,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 3: /* fill iowait cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IOWAIT) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IOWAIT) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -496,7 +496,7 @@ cleanup: int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams) { int ret = -1; @@ -504,20 +504,20 @@ int linuxNodeGetMemoryStats(FILE *meminfo, int found = 0; int nr_param; char line[1024]; - char meminfo_hdr[VIR_MEMORY_STATS_FIELD_LENGTH]; + char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long val; struct field_conv { const char *meminfo_hdr; // meminfo header const char *field; // MemoryStats field name } field_conv[] = { - {"MemTotal:", VIR_MEMORY_STATS_TOTAL}, - {"MemFree:", VIR_MEMORY_STATS_FREE}, - {"Buffers:", VIR_MEMORY_STATS_BUFFERS}, - {"Cached:", VIR_MEMORY_STATS_CACHED}, + {"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL}, + {"MemFree:", VIR_NODE_MEMORY_STATS_FREE}, + {"Buffers:", VIR_NODE_MEMORY_STATS_BUFFERS}, + {"Cached:", VIR_NODE_MEMORY_STATS_CACHED}, {NULL, NULL} }; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { nr_param = LINUX_NB_MEMORY_STATS_ALL; } else { nr_param = LINUX_NB_MEMORY_STATS_CELL; @@ -570,7 +570,7 @@ int linuxNodeGetMemoryStats(FILE *meminfo, struct field_conv *convp = &field_conv[j]; if (STREQ(meminfo_hdr, convp->meminfo_hdr)) { - virMemoryStatsPtr param = &params[k++]; + virNodeMemoryStatsPtr param = &params[k++]; if (virStrcpyStatic(param->field, convp->field) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, @@ -637,7 +637,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { @@ -666,7 +666,7 @@ int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { @@ -678,7 +678,7 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, char *meminfo_path = NULL; FILE *meminfo; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { meminfo_path = strdup(MEMINFO_PATH); if (!meminfo_path) { virReportOOMError(); diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 1ebcdb1..9b2658f 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -32,12 +32,12 @@ int nodeCapsInitNUMA(virCapsPtr caps); int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetCellsFreeMemory(virConnectPtr conn, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f4b43e0..6b74bb5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1699,7 +1699,7 @@ done: static int remoteNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, int *nparams, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; @@ -1765,7 +1765,7 @@ done: static int remoteNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, int *nparams, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; diff --git a/tools/virsh.c b/tools/virsh.c index 19db058..43b4bd3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3734,8 +3734,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) int i, j; bool flag_utilization = false; bool flag_percent = vshCommandOptBool(cmd, "percent"); - int cpuNum = VIR_CPU_STATS_ALL_CPUS; - virCPUStatsPtr params; + int cpuNum = VIR_NODE_CPU_STATS_ALL_CPUS; + virNodeCPUStatsPtr params; int nparams = 0; bool ret = false; struct cpu_stats { @@ -3779,15 +3779,15 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) for (j = 0; j < nparams; j++) { unsigned long long value = params[j].value; - if (STREQ(params[j].field, VIR_CPU_STATS_KERNEL)) { + if (STREQ(params[j].field, VIR_NODE_CPU_STATS_KERNEL)) { cpu_stats[i].sys = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_USER)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_USER)) { cpu_stats[i].user = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IDLE)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IDLE)) { cpu_stats[i].idle = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IOWAIT)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IOWAIT)) { cpu_stats[i].iowait = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_UTILIZATION)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_UTILIZATION)) { cpu_stats[i].util = value; flag_utilization = true; } @@ -3861,8 +3861,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) { int nparams = 0; unsigned int i = 0; - int cellNum = VIR_MEMORY_STATS_ALL_CELLS; - virMemoryStatsPtr params = NULL; + int cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; + virNodeMemoryStatsPtr params = NULL; bool ret = false; if (!vshConnectionUsability(ctl, ctl->conn)) -- 1.7.0.4

3 4