Merge pull request #2874 from elfiesmelfie/feat_virt_block_info

[collectd.git] / src / virt.c

diff --git a/src/virt.c b/src/virt.c
index 93f9ceb..2f64b50 100644 (file)
--- a/src/virt.c
+++ b/src/virt.c
@@ -22,10 +22,10 @@
 
 #include "collectd.h"
 
 
 #include "collectd.h"
 

-#include "common.h"

 #include "plugin.h"
 #include "plugin.h"

+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"

 #include "utils_complain.h"
 #include "utils_complain.h"

-#include "utils_ignorelist.h"

 
 #include <libgen.h> /* for basename(3) */
 #include <libvirt/libvirt.h>
 
 #include <libgen.h> /* for basename(3) */
 #include <libvirt/libvirt.h>


@@ -735,7 +735,7 @@ static int get_block_stats(struct lv_block_stats *bstats,
       ERROR(PLUGIN_NAME " plugin: %s failed: %s", (s), err->message);          \
   } while (0)
 
       ERROR(PLUGIN_NAME " plugin: %s failed: %s", (s), err->message);          \
   } while (0)
 

-char *metadata_get_hostname(virDomainPtr dom) {
+static char *metadata_get_hostname(virDomainPtr dom) {

   const char *xpath_str = NULL;
   if (hm_xpath == NULL)
     xpath_str = "/instance/name/text()";
   const char *xpath_str = NULL;
   if (hm_xpath == NULL)
     xpath_str = "/instance/name/text()";