[PATCH 1/2] Xen: VIR_FROM_THIS cleanup

[Jim Fehlig <jfehlig@xxxxxxxx>]

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.

Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
---
 src/xen/xs_internal.c         | 2 +-
 src/xenconfig/xen_common.c    | 1 +
 src/xenconfig/xen_sxpr.c      | 2 ++
 src/xenconfig/xen_xm.c        | 1 +
 src/xenconfig/xenxs_private.h | 2 --
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 7e2d477..7c82a34 100644
--- 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 7cc8639..284a2e5 100644
--- 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 cd6f207..252a48b 100644
--- 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 f3e2f71..e09d97e 100644
--- 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 4f529d6..71e8a1a 100644
--- 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__ */
-- 
2.6.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list