X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvirt.c;h=830db5136db00a015857a58b53d6d84643d11500;hb=38dd976ae03dcc308233523047dfa866a02f8492;hp=471bdd7481873e40173556612ba6d48c7a23b205;hpb=d11224e04dde09a1964835162f6915acc7aec934;p=collectd.git diff --git a/src/virt.c b/src/virt.c index 471bdd74..830db513 100644 --- a/src/virt.c +++ b/src/virt.c @@ -936,10 +936,10 @@ static int refresh_lists(struct lv_read_instance *inst) { } /* Block devices. */ - char *bd_xmlpath = "/domain/devices/disk/target[@dev]"; + const char *bd_xmlpath = "/domain/devices/disk/target[@dev]"; if (blockdevice_format == source) bd_xmlpath = "/domain/devices/disk/source[@dev]"; - xpath_obj = xmlXPathEval((xmlChar *)bd_xmlpath, xpath_ctx); + xpath_obj = xmlXPathEval((const xmlChar *)bd_xmlpath, xpath_ctx); if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET || xpath_obj->nodesetval == NULL) @@ -1178,9 +1178,7 @@ static int lv_shutdown(void) { lv_fini_instance(i); } - if (conn != NULL) - virConnectClose(conn); - conn = NULL; + lv_disconnect(); ignorelist_free(il_domains); il_domains = NULL;