Tue Nov 20 10:49:28 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

	* src/virterror.c, src/stats_linux.c, include/libvirt/virterror.h:
	  Renamed the VIR_FROM_LINUX error as VIR_FROM_STATS_LINUX for
	  consistency.

diff --git a/ChangeLog b/ChangeLog
index 8a9e40b88c9dc7f78a959e7365dc465af20b5e25..5500300cb6f8ba46c4fdbd44a8a7e014d08cdd35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 20 10:49:28 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/virterror.c, src/stats_linux.c, include/libvirt/virterror.h:
+         Renamed the VIR_FROM_LINUX error as VIR_FROM_STATS_LINUX for
+         consistency.
+
 Tue Nov 20 11:06:28 CET 2007 Daniel Veillard <veillard@redhat.com>
 
        * include/libvirt/virterror.h src/openvz_conf.c src/openvz_driver.c

diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index 505c6d117b349fd02809205ab6f741e1357e400e..0b22c8f69a04067ace3bf59820d404c1e4cbaa21 100644 (file)
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -53,7 +53,7 @@ typedef enum {
     VIR_FROM_REMOTE,   /* Error from remote driver */
     VIR_FROM_OPENVZ,    /* Error from OpenVZ driver */
     VIR_FROM_XENXM,    /* Error at Xen XM layer */
-    VIR_FROM_LINUX,    /* Error in the Linux Stats code */
+    VIR_FROM_STATS_LINUX, /* Error in the Linux Stats code */
 } virErrorDomain;
 
 

diff --git a/src/stats_linux.c b/src/stats_linux.c
index 8c35eb5291d54a4657da5978426ad98bfe4bb962..de73cef4cb06ce8fb88879a4974205204bb42996 100644 (file)
--- a/src/stats_linux.c
+++ b/src/stats_linux.c
@@ -51,7 +51,8 @@ statsErrorFunc (virConnectPtr conn,
         fullinfo[sizeof (fullinfo) - 1] = 0;
         info = fullinfo;
     }
-    __virRaiseError(conn, NULL, NULL, VIR_FROM_LINUX, error, VIR_ERR_ERROR,
+    __virRaiseError(conn, NULL, NULL, VIR_FROM_STATS_LINUX, error,
+                    VIR_ERR_ERROR,
                     errmsg, info, NULL, value, 0, errmsg, info,
                     value);
 }

diff --git a/src/virterror.c b/src/virterror.c
index a315cdedf7a67b6e42a0171eebdc006aac6abb57..6bc64951a8bb429870829e9f68b02ff23ea5377a 100644 (file)
--- a/src/virterror.c
+++ b/src/virterror.c
@@ -295,7 +295,7 @@ virDefaultErrorFunc(virErrorPtr err)
         case VIR_FROM_XENXM:
             dom = "Xen XM ";
             break;
-        case VIR_FROM_LINUX:
+        case VIR_FROM_STATS_LINUX:
             dom = "Linux Stats ";
             break;