xenconfig: move contents to libxl driver and remove directory

After the legacy xen driver was removed the libxl driver became
the only consumer of xenconfig. Move the few files in xenconfig
to the libxl driver and remove the directory.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index c459ad443fe4caf3f51aad41eef36bf1ba9ad669..1f29729949b75e45c7d96262e22294079b82b9c7 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -791,7 +791,7 @@ sc_prohibit_cross_inclusion:
            access/ | conf/) safe="($$dir|conf|util)";; \
            cpu/| network/| node_device/| rpc/| security/| storage/) \
              safe="($$dir|util|conf|storage)";; \
-           xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen|cpu)";; \
+           xenapi/) safe="($$dir|util|conf|xen|cpu)";; \
            *) safe="($$dir|$(mid_dirs)|util)";; \
          esac; \
          in_vc_files="^src/$$dir" \

diff --git a/configure.ac b/configure.ac
index a60543072dbb3a212cc1906de9cee6aa72a82b0f..890702a89d7f485aee993238254cacef0f7da8d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -465,8 +465,6 @@ LIBVIRT_DRIVER_CHECK_LIBVIRTD
 LIBVIRT_DRIVER_CHECK_NETWORK
 LIBVIRT_DRIVER_CHECK_INTERFACE
 
-AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes"])
-
 
 dnl
 dnl in case someone want to build static binaries

diff --git a/po/POTFILES b/po/POTFILES
index c62bc32bb291e3f8c7cc8ba86d8234713cc5d121..e466e1bc553b64c3919e7d402bb152dd429d7346 100644 (file)
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -88,6 +88,9 @@ src/libxl/libxl_conf.c
 src/libxl/libxl_domain.c
 src/libxl/libxl_driver.c
 src/libxl/libxl_migration.c
+src/libxl/xen_common.c
+src/libxl/xen_xl.c
+src/libxl/xen_xm.c
 src/locking/lock_daemon.c
 src/locking/lock_daemon_dispatch.c
 src/locking/lock_driver_lockd.c
@@ -291,9 +294,6 @@ src/vz/vz_utils.c
 src/vz/vz_utils.h
 src/xenapi/xenapi_driver.c
 src/xenapi/xenapi_utils.c
-src/xenconfig/xen_common.c
-src/xenconfig/xen_xl.c
-src/xenconfig/xen_xm.c
 tests/virpolkittest.c
 tools/libvirt-guests.sh.in
 tools/virsh-checkpoint.c

diff --git a/src/Makefile.am b/src/Makefile.am
index adaf61350a441b5bc903b5327ae88fbf6da9cb31..6626659113017ce437615a54400e1774fc067522 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -118,7 +118,6 @@ include vbox/Makefile.inc.am
 include openvz/Makefile.inc.am
 include qemu/Makefile.inc.am
 include bhyve/Makefile.inc.am
-include xenconfig/Makefile.inc.am
 include libxl/Makefile.inc.am
 include xenapi/Makefile.inc.am
 include vz/Makefile.inc.am

diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
deleted file mode 100644 (file)
index 6e2e578..0000000
--- a/src/libvirt_xenconfig.syms
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL.
-#
-
-# xenconfig/xen_xm.h
-xenFormatXM;
-xenParseXM;
-
-# Let emacs know we want case-insensitive sorting
-# Local Variables:
-# sort-fold-case: t
-# End:

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 1587404586b9e62ca3541a0a607ef6441ca8d321..560b214877a19527c1293949236c6bcc208024b6 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -1,6 +1,13 @@
 # vim: filetype=automake
 
 LIBXL_DRIVER_SOURCES = \
+       libxl/xenxs_private.h \
+       libxl/xen_common.c \
+       libxl/xen_common.h \
+       libxl/xen_xl.c \
+       libxl/xen_xl.h \
+       libxl/xen_xm.c \
+       libxl/xen_xm.h \
        libxl/libxl_conf.c \
        libxl/libxl_conf.h \
        libxl/libxl_capabilities.c \
@@ -15,29 +22,13 @@ LIBXL_DRIVER_SOURCES = \
        libxl/libxl_migration.h \
        $(NULL)
 
-XENCONFIG_LIBXL_SOURCES = \
-       $(XENCONFIG_SOURCES) \
-       xenconfig/xen_xl.c \
-       xenconfig/xen_xl.h \
-       $(NULL)
-
 DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES)
 STATEFUL_DRIVER_SOURCE_FILES += $(LIBXL_DRIVER_SOURCES)
 EXTRA_DIST += \
        $(LIBXL_DRIVER_SOURCES) \
-       $(XENCONFIG_LIBXL_SOURCES) \
        $(NULL)
 
 if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
-libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
-libvirt_xenconfig_libxl_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       -I$(srcdir)/libxl \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
-
 noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
 libvirt_driver_libxl_la_SOURCES =
 libvirt_driver_libxl_la_LIBADD = \
@@ -54,14 +45,12 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
        -I$(srcdir)/access \
        -I$(srcdir)/conf \
        -I$(srcdir)/secret \
-       -I$(srcdir)/xenconfig \
        $(AM_CFLAGS) \
        $(NULL)
 libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_libxl_impl_la_LIBADD = \
        $(LIBXL_LIBS) \
        $(LIBXML_LIBS) \
-       libvirt_xenconfig_libxl.la \
        $(NULL)
 libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
 

diff --git a/src/xenconfig/xen_common.c b/src/libxl/xen_common.c
similarity index 100%
rename from src/xenconfig/xen_common.c
rename to src/libxl/xen_common.c

diff --git a/src/xenconfig/xen_common.h b/src/libxl/xen_common.h
similarity index 100%
rename from src/xenconfig/xen_common.h
rename to src/libxl/xen_common.h

diff --git a/src/xenconfig/xen_xl.c b/src/libxl/xen_xl.c
similarity index 100%
rename from src/xenconfig/xen_xl.c
rename to src/libxl/xen_xl.c

diff --git a/src/xenconfig/xen_xl.h b/src/libxl/xen_xl.h
similarity index 100%
rename from src/xenconfig/xen_xl.h
rename to src/libxl/xen_xl.h

diff --git a/src/xenconfig/xen_xm.c b/src/libxl/xen_xm.c
similarity index 100%
rename from src/xenconfig/xen_xm.c
rename to src/libxl/xen_xm.c

diff --git a/src/xenconfig/xen_xm.h b/src/libxl/xen_xm.h
similarity index 100%
rename from src/xenconfig/xen_xm.h
rename to src/libxl/xen_xm.h

diff --git a/src/xenconfig/xenxs_private.h b/src/libxl/xenxs_private.h
similarity index 100%
rename from src/xenconfig/xenxs_private.h
rename to src/libxl/xenxs_private.h

diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am
index b6e4ed0bdb76ae17b8cb2665edb8857be767c6c2..aedef4e2a06981be391a9b31002592412d14bb7a 100644 (file)
--- a/src/xenapi/Makefile.inc.am
+++ b/src/xenapi/Makefile.inc.am
@@ -18,7 +18,6 @@ libvirt_driver_xenapi_la_CFLAGS = \
        $(XENAPI_CFLAGS) \
        $(CURL_CFLAGS) \
        -I$(srcdir)/conf \
-       -I$(srcdir)/xenconfig \
        $(AM_CFLAGS) \
        $(NULL)
 libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)

diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
deleted file mode 100644 (file)
index 5785b49..0000000
--- a/src/xenconfig/Makefile.inc.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim: filetype=automake
-
-XENCONFIG_SOURCES = \
-       xenconfig/xenxs_private.h \
-       xenconfig/xen_common.c \
-       xenconfig/xen_common.h \
-       xenconfig/xen_xm.c \
-       xenconfig/xen_xm.h \
-       $(NULL)
-
-EXTRA_DIST += $(XENCONFIG_SOURCES)
-
-if WITH_XENCONFIG
-noinst_LTLIBRARIES += libvirt_xenconfig.la
-libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
-libvirt_xenconfig_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
-
-endif WITH_XENCONFIG
-
-if WITH_XENCONFIG
-USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-else ! WITH_XENCONFIG
-SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-endif ! WITH_XENCONFIG

diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 59171606d1da1388163101b4b8b7bcd0e0d2dc78..ae0db712937364544932e038461fe8e077b5dd28 100644 (file)
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "datatypes.h"
-#include "xenconfig/xen_xl.h"
+#include "libxl/xen_xl.h"
 #include "viralloc.h"
 #include "virstring.h"
 #include "testutils.h"

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 1de3c33f69d70e84b1a09a00c3312868548f73a2..3137dc564cf9a5c47818e5bfa2ba37eaff5bc7d0 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -25,7 +25,7 @@
 
 #include "internal.h"
 #include "datatypes.h"
-#include "xenconfig/xen_xm.h"
+#include "libxl/xen_xm.h"
 #include "testutils.h"
 #include "testutilsxen.h"
 #include "viralloc.h"