X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvirt.c;h=79d46826997d2222590839769137a0ea28155c34;hb=5c2993e4121feae745551be182221b31bc23ff97;hp=663555b9bd33a2375d717482987041824a3f5c76;hpb=0657d95eaa686d64efe6bbccda346ebd6467bd0b;p=collectd.git diff --git a/src/virt.c b/src/virt.c index 663555b9..79d46826 100644 --- a/src/virt.c +++ b/src/virt.c @@ -128,7 +128,7 @@ enum plginst_field { }; static enum plginst_field plugin_instance_format[PLGINST_MAX_FIELDS] = - { plginst_name }; + { plginst_none }; /* InterfaceFormat. */ enum if_field { @@ -327,8 +327,8 @@ lv_init (void) { if (virInitialize () != 0) return -1; - - return 0; + else + return 0; } static int @@ -449,7 +449,10 @@ lv_config (const char *key, const char *value) } for (i = 0; i < n; ++i) { - if (strcasecmp (fields[i], "name") == 0) + if (strcasecmp (fields[i], "none") == 0) { + plugin_instance_format[i] = plginst_none; + break; + } else if (strcasecmp (fields[i], "name") == 0) plugin_instance_format[i] = plginst_name; else if (strcasecmp (fields[i], "uuid") == 0) plugin_instance_format[i] = plginst_uuid; @@ -830,7 +833,7 @@ refresh_lists (void) } static void -free_domains () +free_domains (void) { int i; @@ -863,7 +866,7 @@ add_domain (virDomainPtr dom) } static void -free_block_devices () +free_block_devices (void) { int i; @@ -903,7 +906,7 @@ add_block_device (virDomainPtr dom, const char *path) } static void -free_interface_devices () +free_interface_devices (void) { int i;