Xen: VIR_FROM_THIS cleanup

The virErrorDomain enum has VIR_FROM_XEN, VIR_FROM_XEND,
VIR_FROM_XENSTORE, VIR_FROM_SEXPR, and VIR_FROM_XENXM. Use
these elements in the corresponding .c files. While at it,
remove the VIR_FROM_THIS define in src/xenconfig/xenxs_private.h.

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 7e2d477c1eba413245fdede2e4307a1164cc6b5e..7c82a3444c9cb84c26d2ba8d5957840e08ca8fa1 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -52,7 +52,7 @@
 #include "xen_hypervisor.h"
 #include "virstring.h"
 
-#define VIR_FROM_THIS VIR_FROM_XEN
+#define VIR_FROM_THIS VIR_FROM_XENSTORE
 
 VIR_LOG_INIT("xen.xs_internal");
 

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 7cc8639977d93b5ebb866d455489fac56772a292..284a2e5c9299bd28741c9608c9a01b1b2e6f16fa 100644 (file)
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -39,6 +39,7 @@
 #include "virstring.h"
 #include "xen_common.h"
 
+#define VIR_FROM_THIS VIR_FROM_XEN
 
 /*
  * Convenience method to grab a long int from the config file object

diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index cd6f2079d9d2225ec18850985b5ff772ac5c92e3..252a48b3d4e74df3c8ca31a83b0637c5d6c14b7e 100644 (file)
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -41,6 +41,8 @@
 #include "virstoragefile.h"
 #include "virstring.h"
 
+#define VIR_FROM_THIS VIR_FROM_SEXPR
+
 VIR_LOG_INIT("xenconfig.xen_sxpr");
 
 /* Get a domain id from a S-expression string */

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index f3e2f719df0d7444a81f511b086ece8ff0c91a36..e09d97e7b60880fcd8aca69bbce88ae856dd4bbf 100644 (file)
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -36,6 +36,7 @@
 #include "virstring.h"
 #include "xen_common.h"
 
+#define VIR_FROM_THIS VIR_FROM_XENXM
 
 static int
 xenParseXMOS(virConfPtr conf, virDomainDefPtr def)

diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h
index 4f529d658ed93ae0fd076a5e35fc5b7f79160ac4..71e8a1a5c2e9e07281f4e3f9a019ea3bb0604d48 100644 (file)
--- a/src/xenconfig/xenxs_private.h
+++ b/src/xenconfig/xenxs_private.h
@@ -46,6 +46,4 @@
 #  define DEFAULT_VIF_SCRIPT "vif-bridge"
 # endif
 
-# define VIR_FROM_THIS VIR_FROM_NONE
-
 #endif /* __VIR_XENXS_PRIVATE_H__ */