Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	ChangeLog
	src/libvirt.c
	src/plugin.c
	src/plugin.h
	version-gen.sh

diff --cc ChangeLog
index 95a3e71e5156a84ee594503332b4afec0dd93e3f,90ff1c6010b92a01196687470bfa68f11fa07e9b..b670f150a50495e8f558f98f31c82ff1adc2ce50
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,73 -1,21 +1,91 @@@
 +yyyy-mm-dd, Version 5.0.0
 +      * collectd: The "FQDNLookup" option is now enabled by default.
 +      * collectd: The internal representation of time has been changed to
 +        allow a higher accuracy than one second.
 +      * collectdcmd: This new command line utility can send various commands
 +        to collectd using the UnixSock plugin. Thanks to Håkon Dugstad
 +        Johnsen and Sebastian Harl for their code.
 +      * collectd-nagios: The "-m" option has been implemented (treat NaNs as
 +        critical).
 +      * collectd-tg: Traffic generator creating bogus network traffic
 +        compatible to the Network plugin. This utility can be used to
 +        stress-test new write plugins and collectd in general.
 +      * libcollectdclient: Creating and sending network packets has been
 +        added to the collectd client library.
 +      * All data sets: The data source name of all data sets with exactly
 +        one data source has been changed to "value".
 +      * All plugins: All "counter" data sources have been converted to
 +        "derive" data sources. All plugins now use "derive" by default, but
 +        plugins such as the network plugin can still handle "counter", of
 +        course. The minimum value of all derive data sources is zero, the
 +        maximum value is unspecified.
 +      * amqp plugin: The new AMQP plugin can send data to and receive data
 +        from an AMQP broker. Thanks to Sebastien Pahl for his code.
 +      * apache plugin: Backwards compatibility code has been removed.
 +        Support for the IBM HTTP Server has been added. Thanks to Manuel
 +        Luis Sanmartín Rozada for his patch.
 +      * contextswitch plugin: Support for sysctlbyname(3) has been added.
 +        Thanks to Kimo Rosenbaum for his patch.
 +      * df plugin: The default behavior has been changed to be equivalent to
 +        the "ReportReserved" behavior of v4.
 +      * dns plugin: Improved RFC 1035 name parsing has been imported from
 +        "dnstop".
 +      * exec plugin: Backwards compatibility code has been removed.
 +      * GenericJMX plugin: The "InstancePrefix" option has been added to
 +        "Connection" blocks.
 +      * hddtemp plugin: The "TranslateDevicename" config option has been
 +        removed.
 +      * interface plugin: Use the "plugin instance" to store the interface
 +        value.
 +      * libvirt plugin: The "InterfaceFormat" option has been added. Thanks
 +        to Ruben Kerkhof for his patch.
 +      * lpar plugin: New plugins for "logical partitions", a virtualization
 +        technique of POWER CPUs. Thanks to Aurélien Reynaud for his code and
 +        patience.
 +      * modbus plugin: Support for libmodbus 2.9.2 has been added and the
 +        license has been changes to LGPLv2.1.
 +      * mysql plugin: Backwards compatibility code has been removed. The
 +        data sets used have been improved.
 +      * network plugin: The default buffer size has been increased to
 +        1452 bytes.
 +      * perl plugin: Backwards compatibility code has been removed.
 +      * postgresql plugin: Backwards compatibility code has been removed.
 +      * redis plugin: Plugin for collecting statistics from Redis, a key-
 +        value store, has been added. Thanks to Andres J. Diaz for his code.
 +      * swap plugin: Implement collection of physical and virtual memory
 +        statistics under Solaris. The new default is collecting physical
 +        memory. Thanks to Aurélien Reynaud for his patches.
 +      * threshold plugin: The threshold configuration has been moved into
 +        this separate plugin.
 +      * unixsock plugin: The "DeleteSocket" option has been added.
 +      * varnish plugin: The new Varnish plugin reads statistics from
 +        Varnish, a web accelerator. Thanks to Jérôme Renard and Marc
 +        Fournier for their contributions.
 +      * write_redis: New plugin for writing data to Redis, a key-value
 +        store.
 +      * zfs_arc plugin: The data sets have been replaced by more elegant
 +        alternatives.
 +      * v5upgrade target: Target for converting v4 data sets to the v5
 +        schema.
 +
+ 2011-03-26, Version 4.10.3
+       * Documentation: Several updates and additions. Thanks to Sebastian Harl.
+       * collectd: Build issues (compiler warnings) have been fixed. Thanks to
+         Bruno Prémont.
+       * collectd: Threshold subsection: Handling of NAN values in the
+         percentage calculation has been fixed.
+       * collectd, java plugin, ntpd plugin: Several diagnostic messages have
+         been improved.
+       * curl_json plugin: Handling of arrays has been fixed.
+       * libvirt plugin: A bug in reading the virtual CPU statistics has been
+         fixed. Thanks to “JLPC” for reporting this problem.
+       * modbus plugin: Compatibility with libmodbus 2.0.3 has been restored.
+       * processes plugin: Potentially erroneous behavior has been fixed in an
+         error handling case.
+       * python plugin: Fix dispatching of values from Python scripts to
+         collectd. Thanks to Gregory Szorc for finding and fixing this
+         problem.
+ 
  2010-11-27, Version 4.10.2
        * Documentation: Various documentation fixes.
        * collectd: If including one configuration file fails, continue with

diff --cc src/libvirt.c
index b5e7e99ca6ea28c9944359df7c555d84fd8dce22,91fda7a5e6c9bcba145da37211356a6acdeef4de..c74b937e39a2bb7e1569cfd0fe22fc5592a3dba2
--- 1/src/libvirt.c
--- 2/src/libvirt.c
+++ b/src/libvirt.c
@@@ -413,14 -295,20 +413,20 @@@ lv_read (void
      for (i = 0; i < nr_domains; ++i) {
          virDomainInfo info;
          virVcpuInfoPtr vinfo = NULL;
+         int status;
          int j;
  
-         if (virDomainGetInfo (domains[i], &info) != 0)
+         status = virDomainGetInfo (domains[i], &info);
+         if (status != 0)
+         {
+             ERROR ("libvirt plugin: virDomainGetInfo failed with status %i.",
+                     status);
              continue;
+         }
  
 -        cpu_submit (info.cpuTime, t, domains[i], "virt_cpu_total");
 +        cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
  
-         vinfo = malloc (info.nrVirtCpu * sizeof vinfo[0]);
+         vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
          if (vinfo == NULL) {
              ERROR ("libvirt plugin: malloc failed.");
              continue;

diff --cc src/plugin.c
index 099990d77f2fe564cc36774ab3d9bdf1faabfc19,a3f10ae2b4952e954f0213f9edac18e9ce3e869c..89a2e003b65c32af000bdfe9a3101f69caa7c05f
--- 1/src/plugin.c
--- 2/src/plugin.c
+++ b/src/plugin.c
@@@ -865,14 -852,7 +865,14 @@@ int plugin_register_flush (const char *
                                (void *) callback, ud));
  } /* int plugin_register_flush */
  
- int plugin_register_shutdown (char *name,
 +int plugin_register_missing (const char *name,
 +              plugin_missing_cb callback, user_data_t *ud)
 +{
 +      return (create_register_callback (&list_missing, name,
 +                              (void *) callback, ud));
 +} /* int plugin_register_missing */
 +
+ int plugin_register_shutdown (const char *name,
                int (*callback) (void))
  {
        return (create_register_callback (&list_shutdown, name,

diff --cc src/plugin.h
index 4d5201b68d3bd0b532630a0cef3ed211c72a2fed,3f94dbc89cc07ba10168aa84e7923f6e3eb6ac69..e88047283d2325252b068f252f20b5c6a2b196e1
--- 1/src/plugin.h
--- 2/src/plugin.h
+++ b/src/plugin.h
@@@ -279,9 -272,7 +279,9 @@@ int plugin_register_write (const char *
                plugin_write_cb callback, user_data_t *user_data);
  int plugin_register_flush (const char *name,
                plugin_flush_cb callback, user_data_t *user_data);
- int plugin_register_shutdown (char *name,
 +int plugin_register_missing (const char *name,
 +              plugin_missing_cb callback, user_data_t *user_data);
+ int plugin_register_shutdown (const char *name,
                plugin_shutdown_cb callback);
  int plugin_register_data_set (const data_set_t *ds);
  int plugin_register_log (const char *name,