From 4ef3a4ea7cb7dc79e39a0ba12a65b1bd9e4c0cfd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 Nov 2007 10:58:21 +0000 Subject: [PATCH] Tue Nov 20 10:49:28 UTC 2007 Richard W.M. Jones * src/virterror.c, src/stats_linux.c, include/libvirt/virterror.h: Renamed the VIR_FROM_LINUX error as VIR_FROM_STATS_LINUX for consistency. --- ChangeLog | 6 ++++++ include/libvirt/virterror.h | 2 +- src/stats_linux.c | 3 ++- src/virterror.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a9e40b88c..5500300cb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 20 10:49:28 UTC 2007 Richard W.M. Jones + + * 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 * 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 505c6d117b..0b22c8f69a 100644 --- 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 8c35eb5291..de73cef4cb 100644 --- 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 a315cdedf7..6bc64951a8 100644 --- 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;