projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2701 from elfiesmelfie/feat_virt_notify_lifecycle
[collectd.git]
/
src
/
virt.c
diff --git
a/src/virt.c
b/src/virt.c
index
d58f682
..
3785385
100644
(file)
--- a/
src/virt.c
+++ b/
src/virt.c
@@
-468,8
+468,8
@@
const char *domain_reasons[][DOMAIN_STATE_REASON_MAX_SIZE] = {
} while (0)
/* Connection. */
} while (0)
/* Connection. */
-static virConnectPtr conn
= 0
;
-static char *conn_string
= NULL
;
+static virConnectPtr conn;
+static char *conn_string;
static c_complain_t conn_complain = C_COMPLAIN_INIT_STATIC;
/* Node information required for %CPU */
static c_complain_t conn_complain = C_COMPLAIN_INIT_STATIC;
/* Node information required for %CPU */
@@
-479,11
+479,11
@@
static virNodeInfo nodeinfo;
static int interval = 60;
/* List of domains, if specified. */
static int interval = 60;
/* List of domains, if specified. */
-static ignorelist_t *il_domains
= NULL
;
+static ignorelist_t *il_domains;
/* List of block devices, if specified. */
/* List of block devices, if specified. */
-static ignorelist_t *il_block_devices
= NULL
;
+static ignorelist_t *il_block_devices;
/* List of network interface devices, if specified. */
/* List of network interface devices, if specified. */
-static ignorelist_t *il_interface_devices
= NULL
;
+static ignorelist_t *il_interface_devices;
static int ignore_device_match(ignorelist_t *, const char *domname,
const char *devpath);
static int ignore_device_match(ignorelist_t *, const char *domname,
const char *devpath);
@@
-2607,7
+2607,7
@@
static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
struct interface_device *new_ptr;
int new_size =
sizeof(state->interface_devices[0]) * (state->nr_interface_devices + 1);
struct interface_device *new_ptr;
int new_size =
sizeof(state->interface_devices[0]) * (state->nr_interface_devices + 1);
- char *path_copy, *address_copy, number_string[
15
];
+ char *path_copy, *address_copy, number_string[
21
];
if ((path == NULL) || (address == NULL))
return EINVAL;
if ((path == NULL) || (address == NULL))
return EINVAL;