From ecc4d75d012e3a90663a1eeb988c2bd2645af28c Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Fri, 23 Aug 2019 12:34:46 -0600 Subject: [PATCH] xenconfig: move contents to libxl driver and remove directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- cfg.mk | 2 +- configure.ac | 2 -- po/POTFILES | 6 ++--- src/Makefile.am | 1 - src/libvirt_xenconfig.syms | 12 ---------- src/libxl/Makefile.inc.am | 25 ++++++--------------- src/{xenconfig => libxl}/xen_common.c | 0 src/{xenconfig => libxl}/xen_common.h | 0 src/{xenconfig => libxl}/xen_xl.c | 0 src/{xenconfig => libxl}/xen_xl.h | 0 src/{xenconfig => libxl}/xen_xm.c | 0 src/{xenconfig => libxl}/xen_xm.h | 0 src/{xenconfig => libxl}/xenxs_private.h | 0 src/xenapi/Makefile.inc.am | 1 - src/xenconfig/Makefile.inc.am | 28 ------------------------ tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- 17 files changed, 13 insertions(+), 68 deletions(-) delete mode 100644 src/libvirt_xenconfig.syms rename src/{xenconfig => libxl}/xen_common.c (100%) rename src/{xenconfig => libxl}/xen_common.h (100%) rename src/{xenconfig => libxl}/xen_xl.c (100%) rename src/{xenconfig => libxl}/xen_xl.h (100%) rename src/{xenconfig => libxl}/xen_xm.c (100%) rename src/{xenconfig => libxl}/xen_xm.h (100%) rename src/{xenconfig => libxl}/xenxs_private.h (100%) delete mode 100644 src/xenconfig/Makefile.inc.am diff --git a/cfg.mk b/cfg.mk index c459ad443f..1f29729949 100644 --- 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 a60543072d..890702a89d 100644 --- 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 c62bc32bb2..e466e1bc55 100644 --- 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 adaf61350a..6626659113 100644 --- 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 index 6e2e578b15..0000000000 --- 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 1587404586..560b214877 100644 --- 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 b6e4ed0bdb..aedef4e2a0 100644 --- 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 index 5785b49268..0000000000 --- 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 59171606d1..ae0db71293 100644 --- 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 1de3c33f69..3137dc564c 100644 --- 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"