Merge remote-tracking branch 'upstream/master'

diff --combined src/virt.c
index d3d8c6a,9cfdb05..11481a4
--- 1/src/virt.c
--- 2/src/virt.c
+++ b/src/virt.c
@@@ -1004,7 -1004,7 +1004,7 @@@ static void vcpu_submit(derive_t value
                          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);
  }
  
@@@ -1026,7 -1026,7 +1026,7 @@@ static void disk_block_stats_submit(str
    }
  
    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))
@@@ -1130,7 -1130,7 +1130,7 @@@ static void domain_state_submit_notif(v
    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;
@@@ -1578,7 -1578,7 +1578,7 @@@ static void vcpu_pin_submit(virDomainPt
      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);
    }
  }
@@@ -1665,16 -1665,7 +1665,7 @@@ static int get_pcpu_stats(virDomainPtr 
  #endif /* HAVE_CPU_STATS */
  
  #ifdef HAVE_DOM_REASON
- 
- static void domain_state_submit(virDomainPtr dom, int state, int reason) {
-   value_t values[] = {
-       {.gauge = (gauge_t)state}, {.gauge = (gauge_t)reason},
-   };
- 
-   submit(dom, "domain_state", NULL, values, STATIC_ARRAY_SIZE(values));
- }
- 
- static int get_domain_state(virDomainPtr domain) {
+ static int submit_domain_state(virDomainPtr domain) {
    int domain_state = 0;
    int domain_reason = 0;
  
@@@ -1685,9 -1676,13 +1676,13 @@@
      return status;
    }
  
-   domain_state_submit(domain, domain_state, domain_reason);
+   value_t values[] = {
+       {.gauge = (gauge_t)domain_state}, {.gauge = (gauge_t)domain_reason},
+   };
+ 
+   submit(domain, "domain_state", NULL, values, STATIC_ARRAY_SIZE(values));
  
-   return status;
+   return 0;
  }
  
  #ifdef HAVE_LIST_ALL_DOMAINS
@@@ -1702,8 -1697,7 +1697,7 @@@ static int get_domain_state_notify(virD
      return status;
    }
  
-   if (persistent_notification)
-     domain_state_submit_notif(domain, domain_state, domain_reason);
+   domain_state_submit_notif(domain, domain_state, domain_reason);
  
    return status;
  }
@@@ -1737,9 -1731,9 +1731,9 @@@ static int get_memory_stats(virDomainPt
        swap_in = minfo[i].val;
      else if (minfo[i].tag == VIR_DOMAIN_MEMORY_STAT_SWAP_OUT)
        swap_out = minfo[i].val;
-     else if (minfo[i].tag == VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT)
-       min_flt = minfo[i].val;
      else if (minfo[i].tag == VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT)
+       min_flt = minfo[i].val;
+     else if (minfo[i].tag == VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT)
        maj_flt = minfo[i].val;
  #ifdef LIBVIR_CHECK_VERSION
  #if LIBVIR_CHECK_VERSION(2, 1, 0)
@@@ -2007,7 -2001,7 +2001,7 @@@ static int get_domain_metrics(domain_t 
       * however it doesn't provide a reason for entering particular state.
       * We need to get it from virDomainGetState.
       */
-     GET_STATS(get_domain_state, "domain reason", domain->ptr);
+     GET_STATS(submit_domain_state, "domain reason", domain->ptr);
  #endif
    }
  
@@@ -2363,8 -2357,8 +2357,8 @@@ static int lv_read(user_data_t *ud) 
      if (dom->active)
        status = get_domain_metrics(dom);
  #ifdef HAVE_DOM_REASON
-     else
-       status = get_domain_state(dom->ptr);
+     else if (extra_stats & ex_stats_domain_state)
+       status = submit_domain_state(dom->ptr);
  #endif
  
      if (status != 0)
@@@ -2402,7 -2396,7 +2396,7 @@@ static int lv_init_instance(size_t i, p
  
    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);
@@@ -2472,7 -2466,7 +2466,7 @@@ static int lv_domain_get_tag(xmlXPathCo
      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) {
@@@ -2675,7 -2669,7 +2669,7 @@@ static void lv_add_network_interfaces(s
        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;
@@@ -2976,7 -2970,7 +2970,7 @@@ static int add_interface_device(struct 
    }
  
    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);
@@@ -3015,7 -3009,7 +3009,7 @@@ static int ignore_device_match(ignoreli
      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;