X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvirt.c;h=259f37e99877ea1b92d8daf7baab59a01fa85e4f;hb=8f6aa6970bf787e6a11e095322af3338ec781d78;hp=e14f7d6cd8d99356b743f663a6ea32367646a785;hpb=7eb098e42b5f22202495ab396ef1f9bf12d251f2;p=collectd.git diff --git a/src/virt.c b/src/virt.c index e14f7d6c..259f37e9 100644 --- a/src/virt.c +++ b/src/virt.c @@ -1009,7 +1009,7 @@ static void vcpu_submit(derive_t value, virDomainPtr dom, int vcpu_nr, const char *type) { char type_instance[DATA_MAX_NAME_LEN]; - snprintf(type_instance, sizeof(type_instance), "%d", vcpu_nr); + ssnprintf(type_instance, sizeof(type_instance), "%d", vcpu_nr); submit(dom, type, type_instance, &(value_t){.derive = value}, 1); } @@ -1031,7 +1031,7 @@ static void disk_block_stats_submit(struct lv_block_stats *bstats, } char flush_type_instance[DATA_MAX_NAME_LEN]; - snprintf(flush_type_instance, sizeof(flush_type_instance), "flush-%s", + ssnprintf(flush_type_instance, sizeof(flush_type_instance), "flush-%s", type_instance); if ((bstats->bi.rd_req != -1) && (bstats->bi.wr_req != -1)) @@ -1135,7 +1135,7 @@ static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) { const char *reason_str = "N/A"; #endif - snprintf(msg, sizeof(msg), "Domain state: %s. Reason: %s", state_str, + ssnprintf(msg, sizeof(msg), "Domain state: %s. Reason: %s", state_str, reason_str); int severity; @@ -1568,7 +1568,7 @@ static int get_perf_events(virDomainPtr domain) { ERROR(PLUGIN_NAME " plugin: virDomainListGetStats failed with status %i.", status); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { ERROR(PLUGIN_NAME " plugin: Disabled unsupported ExtraStats selector: perf"); @@ -1592,7 +1592,7 @@ static void vcpu_pin_submit(virDomainPtr dom, int max_cpus, int vcpu, char type_instance[DATA_MAX_NAME_LEN]; bool is_set = VIR_CPU_USABLE(cpu_maps, cpu_map_len, vcpu, cpu); - snprintf(type_instance, sizeof(type_instance), "vcpu_%d-cpu_%d", vcpu, cpu); + ssnprintf(type_instance, sizeof(type_instance), "vcpu_%d-cpu_%d", vcpu, cpu); submit(dom, "cpu_affinity", type_instance, &(value_t){.gauge = is_set}, 1); } } @@ -1625,7 +1625,7 @@ static int get_vcpu_stats(virDomainPtr domain, unsigned short nr_virt_cpu) { ERROR(PLUGIN_NAME " plugin: virDomainGetVcpus failed with status %i.", status); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { if (extra_stats & ex_stats_vcpu) ERROR(PLUGIN_NAME @@ -1659,7 +1659,7 @@ static int get_pcpu_stats(virDomainPtr dom) { if (nparams < 0) { VIRT_ERROR(conn, "getting the CPU params count"); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { ERROR(PLUGIN_NAME " plugin: Disabled unsupported ExtraStats selector: pcpu"); @@ -1759,7 +1759,7 @@ static int get_memory_stats(virDomainPtr domain) { mem_stats); sfree(minfo); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { ERROR(PLUGIN_NAME " plugin: Disabled unsupported ExtraStats selector: memory"); @@ -1824,7 +1824,7 @@ static int get_disk_err(virDomainPtr domain) { ERROR(PLUGIN_NAME " plugin: failed to get preferred size of disk errors array"); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { ERROR(PLUGIN_NAME @@ -1879,7 +1879,7 @@ static int get_block_device_stats(struct block_device *block_dev) { ERROR(PLUGIN_NAME " plugin: virDomainGetBlockInfo failed for path: %s", block_dev->path); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { if (extra_stats & ex_stats_disk_allocation) @@ -1983,7 +1983,7 @@ static int get_fs_info(virDomainPtr domain) { ERROR(PLUGIN_NAME " plugin: virDomainGetFSInfo failed: %d", mount_points_cnt); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); if (err->code == VIR_ERR_NO_SUPPORT) { ERROR(PLUGIN_NAME " plugin: Disabled unsupported ExtraStats selector: fs_info"); @@ -2048,7 +2048,7 @@ static int get_job_stats(virDomainPtr domain) { if (ret != 0) { ERROR(PLUGIN_NAME " plugin: virDomainGetJobStats failed: %d", ret); - virErrorPtr err = virConnGetLastError(conn); + virErrorPtr err = virGetLastError(); // VIR_ERR_INVALID_ARG returned when VIR_DOMAIN_JOB_STATS_COMPLETED flag is // not supported by driver if (err->code == VIR_ERR_NO_SUPPORT || err->code == VIR_ERR_INVALID_ARG) { @@ -2520,7 +2520,7 @@ static int lv_init_instance(size_t i, plugin_read_cb callback) { memset(lv_ud, 0, sizeof(*lv_ud)); - snprintf(inst->tag, sizeof(inst->tag), "%s-%" PRIsz, PLUGIN_NAME, i); + ssnprintf(inst->tag, sizeof(inst->tag), "%s-%" PRIsz, PLUGIN_NAME, i); inst->id = i; user_data_t *ud = &(lv_ud->ud); @@ -2590,7 +2590,7 @@ static int lv_domain_get_tag(xmlXPathContextPtr xpath_ctx, const char *dom_name, goto done; } - snprintf(xpath_str, sizeof(xpath_str), "/domain/metadata/%s:%s/text()", + ssnprintf(xpath_str, sizeof(xpath_str), "/domain/metadata/%s:%s/text()", METADATA_VM_PARTITION_PREFIX, METADATA_VM_PARTITION_ELEMENT); xpath_obj = xmlXPathEvalExpression((xmlChar *)xpath_str, xpath_ctx); if (xpath_obj == NULL) { @@ -2793,7 +2793,7 @@ static void lv_add_network_interfaces(struct lv_read_state *state, break; case if_number: { char number_string[4]; - snprintf(number_string, sizeof(number_string), "%d", itf_number); + ssnprintf(number_string, sizeof(number_string), "%d", itf_number); if (ignore_device_match(il_interface_devices, domname, number_string) != 0) device_ignored = true; @@ -3094,7 +3094,7 @@ static int add_interface_device(struct lv_read_state *state, virDomainPtr dom, } char number_string[21]; - snprintf(number_string, sizeof(number_string), "interface-%u", number); + ssnprintf(number_string, sizeof(number_string), "interface-%u", number); char *number_copy = strdup(number_string); if (!number_copy) { sfree(path_copy); @@ -3133,7 +3133,7 @@ static int ignore_device_match(ignorelist_t *il, const char *domname, ERROR(PLUGIN_NAME " plugin: malloc failed."); return 0; } - snprintf(name, n, "%s:%s", domname, devpath); + ssnprintf(name, n, "%s:%s", domname, devpath); int r = ignorelist_match(il, name); sfree(name); return r;