src/xenxs contains parsing/formating functions for the various xen
config formats, and is better named src/xenconfig.
Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
---
cfg.mk | 2 +-
configure.ac | 2 +-
po/POTFILES.in | 4 +--
src/Makefile.am | 38 +++++++++++-----------
src/{libvirt_xenxs.syms => libvirt_xenconfig.syms} | 4 +--
src/{xenxs => xenconfig}/xen_sxpr.c | 2 +-
src/{xenxs => xenconfig}/xen_sxpr.h | 0
src/{xenxs => xenconfig}/xen_xm.c | 0
src/{xenxs => xenconfig}/xen_xm.h | 0
src/{xenxs => xenconfig}/xenxs_private.h | 0
tests/sexpr2xmltest.c | 2 +-
tests/xmconfigtest.c | 2 +-
tests/xml2sexprtest.c | 2 +-
13 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 35ef444..4e302c8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -775,7 +775,7 @@ sc_prohibit_cross_inclusion:
locking/) safe="($$dir|util|conf|rpc)";; \
cpu/| network/| node_device/| rpc/| security/| storage/) \
safe="($$dir|util|conf|storage)";; \
- xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";; \
+ xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen)";; \
*) safe="($$dir|$(mid_dirs)|util)";; \
esac; \
in_vc_files="^src/$$dir" \
diff --git a/configure.ac b/configure.ac
index af3fe28..f93c6c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -967,7 +967,7 @@ AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"])
AC_SUBST([XEN_CFLAGS])
AC_SUBST([XEN_LIBS])
-AM_CONDITIONAL([WITH_XENXS], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
+AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
dnl
dnl check for kernel headers required by xen_inotify
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f09fa94..6bef064 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -232,8 +232,8 @@ src/xen/xm_internal.c
src/xen/xs_internal.c
src/xenapi/xenapi_driver.c
src/xenapi/xenapi_utils.c
-src/xenxs/xen_sxpr.c
-src/xenxs/xen_xm.c
+src/xenconfig/xen_sxpr.c
+src/xenconfig/xen_xm.c
tools/libvirt-guests.sh.in
tools/virsh.c
tools/virsh.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f69923f..9977979 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -964,10 +964,10 @@ CPU_SOURCES = \
VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
-XENXS_SOURCES = \
- xenxs/xenxs_private.h \
- xenxs/xen_sxpr.c xenxs/xen_sxpr.h \
- xenxs/xen_xm.c xenxs/xen_xm.h
+XENCONFIG_SOURCES = \
+ xenconfig/xenxs_private.h \
+ xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \
+ xenconfig/xen_xm.c xenconfig/xen_xm.h
pkgdata_DATA = cpu/cpu_map.xml
@@ -1019,13 +1019,13 @@ libvirt_vmx_la_CFLAGS = \
libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
endif WITH_VMX
-if WITH_XENXS
-noinst_LTLIBRARIES += libvirt_xenxs.la
-libvirt_la_BUILT_LIBADD += libvirt_xenxs.la
-libvirt_xenxs_la_CFLAGS = \
+if WITH_XENCONFIG
+noinst_LTLIBRARIES += libvirt_xenconfig.la
+libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
+libvirt_xenconfig_la_CFLAGS = \
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
-libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES)
-endif WITH_XENXS
+libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
+endif WITH_XENCONFIG
noinst_LTLIBRARIES += libvirt_driver.la
@@ -1101,7 +1101,7 @@ libvirt_driver_xen_impl_la_CFLAGS = \
$(XEN_CFLAGS) \
-I$(top_srcdir)/src/access \
-I$(top_srcdir)/src/conf \
- -I$(top_srcdir)/src/xenxs \
+ -I$(top_srcdir)/src/xenconfig \
$(AM_CFLAGS)
libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS)
@@ -1186,10 +1186,10 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
$(LIBXL_CFLAGS) \
-I$(top_srcdir)/src/access \
-I$(top_srcdir)/src/conf \
- -I$(top_srcdir)/src/xenxs \
+ -I$(top_srcdir)/src/xenconfig \
$(AM_CFLAGS)
libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la
+libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenconfig.la
libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
endif WITH_LIBXL
@@ -1743,7 +1743,7 @@ EXTRA_DIST += \
$(SECRET_DRIVER_SOURCES) \
$(VBOX_DRIVER_EXTRA_DIST) \
$(VMWARE_DRIVER_SOURCES) \
- $(XENXS_SOURCES) \
+ $(XENCONFIG_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
check-local: check-augeas
@@ -1893,11 +1893,11 @@ else ! WITH_VMWARE
SYM_FILES += $(srcdir)/libvirt_vmware.syms
endif ! WITH_VMWARE
-if WITH_XENXS
-USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms
-else ! WITH_XENXS
-SYM_FILES += $(srcdir)/libvirt_xenxs.syms
-endif ! WITH_XENXS
+if WITH_XENCONFIG
+USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+else ! WITH_XENCONFIG
+SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+endif ! WITH_XENCONFIG
if WITH_SASL
USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
diff --git a/src/libvirt_xenxs.syms b/src/libvirt_xenconfig.syms
similarity index 91%
rename from src/libvirt_xenxs.syms
rename to src/libvirt_xenconfig.syms
index 04b35c4..6541685 100644
--- a/src/libvirt_xenxs.syms
+++ b/src/libvirt_xenconfig.syms
@@ -2,7 +2,7 @@
# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL.
#
-# xenxs/xen_sxpr.h
+# xenconfig/xen_sxpr.h
xenFormatSxpr;
xenFormatSxprChr;
xenFormatSxprDisk;
@@ -16,7 +16,7 @@ xenParseSxprChar;
xenParseSxprSound;
xenParseSxprString;
-# xenxs/xen_xm.h
+# xenconfig/xen_xm.h
xenFormatXM;
xenParseXM;
diff --git a/src/xenxs/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
similarity index 99%
rename from src/xenxs/xen_sxpr.c
rename to src/xenconfig/xen_sxpr.c
index 610b7e4..ff81c36 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -39,7 +39,7 @@
#include "virstoragefile.h"
#include "virstring.h"
-VIR_LOG_INIT("xenxs.xen_sxpr");
+VIR_LOG_INIT("xenconfig.xen_sxpr");
/* Get a domain id from a S-expression string */
int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion, int *id)
diff --git a/src/xenxs/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
similarity index 100%
rename from src/xenxs/xen_sxpr.h
rename to src/xenconfig/xen_sxpr.h
diff --git a/src/xenxs/xen_xm.c b/src/xenconfig/xen_xm.c
similarity index 100%
rename from src/xenxs/xen_xm.c
rename to src/xenconfig/xen_xm.c
diff --git a/src/xenxs/xen_xm.h b/src/xenconfig/xen_xm.h
similarity index 100%
rename from src/xenxs/xen_xm.h
rename to src/xenconfig/xen_xm.h
diff --git a/src/xenxs/xenxs_private.h b/src/xenconfig/xenxs_private.h
similarity index 100%
rename from src/xenxs/xenxs_private.h
rename to src/xenconfig/xenxs_private.h
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 15fe187..7247414 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -9,7 +9,7 @@
#include "datatypes.h"
#include "xen/xen_driver.h"
#include "xen/xend_internal.h"
-#include "xenxs/xen_sxpr.h"
+#include "xenconfig/xen_sxpr.h"
#include "testutils.h"
#include "testutilsxen.h"
#include "virstring.h"
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index e9fccc3..0c6f803 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -31,7 +31,7 @@
#include "datatypes.h"
#include "xen/xen_driver.h"
#include "xen/xm_internal.h"
-#include "xenxs/xen_xm.h"
+#include "xenconfig/xen_xm.h"
#include "testutils.h"
#include "testutilsxen.h"
#include "viralloc.h"
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 1bead7d..7d9e780 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -10,7 +10,7 @@
#include "internal.h"
#include "xen/xend_internal.h"
#include "xen/xen_driver.h"
-#include "xenxs/xen_sxpr.h"
+#include "xenconfig/xen_sxpr.h"
#include "testutils.h"
#include "testutilsxen.h"
#include "virstring.h"
--
1.8.4.5
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list