tools/xenstore: move xenstored sources into dedicated directory
PATCH v7 1/1 tools/xenstore: move xenstored sources into dedicated directory
In tools/xenstore there are living xenstored and xenstore clients. They are no longer sharing anything apart from the "xenstore" in their names.
Move the xenstored sources into a new directory tools/xenstored while dropping the "xenstored_" prefix from their names. This will make it clearer that xenstore clients and xenstored are independent from each other.
In order to avoid two very similar named directories below tools, rename tools/xenstore to tools/xs-clients.
Drop the make targets [un]install-clients as those are not used in the Xen tree.
---
After the large overhaul of xenstored I think such a reorg would make sense to go into the same Xen version. Delaying it until the next version would make potential backports for 4.18 harder. V4:
- new patch
V5:
- rename xenstore directory to xs-clients (Julien Grall) V6:
- use local .gitignore files (Andrew Cooper)
V7:
- prepend local .gitignore entries with "/" (Anthony PERARD)
- drop [un]install-clients make targets (Anthony PERARD)
- init xenstored TARGETS make variable with ":=" (Anthony PERARD)
---
.gitignore | 11 -----
MAINTAINERS | 3 +-
stubdom/Makefile | 4 +-
tools/Makefile | 3 +-
tools/xenstored/.gitignore | 1 +
tools/xenstored/Makefile | 48 +++++++++++++++++++
tools/{xenstore => xenstored}/Makefile.common | 13 +++--
tools/{xenstore => xenstored}/README | 0
.../control.c} | 8 ++--
.../control.h} | 0
.../xenstored_core.c => xenstored/core.c} | 14 +++---
.../xenstored_core.h => xenstored/core.h} | 0
.../xenstored_domain.c => xenstored/domain.c} | 10 ++--
.../xenstored_domain.h => xenstored/domain.h} | 0
tools/{xenstore => xenstored}/hashtable.c | 0
tools/{xenstore => xenstored}/hashtable.h | 0
tools/{xenstore => xenstored}/list.h | 0
.../xenstored_lu.c => xenstored/lu.c} | 8 ++--
.../xenstored_lu.h => xenstored/lu.h} | 0
.../lu_daemon.c} | 4 +-
.../lu_minios.c} | 2 +-
.../xenstored_minios.c => xenstored/minios.c} | 2 +-
.../xenstored_osdep.h => xenstored/osdep.h} | 0
.../xenstored_posix.c => xenstored/posix.c} | 4 +-
tools/{xenstore => xenstored}/talloc.c | 0
tools/{xenstore => xenstored}/talloc.h | 0
.../{xenstore => xenstored}/talloc_guide.txt | 0
.../transaction.c} | 6 +--
.../transaction.h} | 2 +-
tools/{xenstore => xenstored}/utils.c | 0
tools/{xenstore => xenstored}/utils.h | 0
.../xenstored_watch.c => xenstored/watch.c} | 6 +--
.../xenstored_watch.h => xenstored/watch.h} | 2 +-
.../include => xenstored}/xenstore_state.h | 0
tools/xs-clients/.gitignore | 10 ++++
tools/{xenstore => xs-clients}/Makefile | 42 ++--------------
.../xenstore_client.c | 0
.../xenstore_control.c | 0
38 files changed, 110 insertions(+), 93 deletions(-)
create mode 100644 tools/xenstored/.gitignore
create mode 100644 tools/xenstored/Makefile
rename tools/{xenstore => xenstored}/Makefile.common (50%)
rename tools/{xenstore => xenstored}/README (100%)
rename tools/{xenstore/xenstored_control.c => xenstored/control.c} (98%)
rename tools/{xenstore/xenstored_control.h => xenstored/control.h} (100%)
rename tools/{xenstore/xenstored_core.c => xenstored/core.c} (99%)
rename tools/{xenstore/xenstored_core.h => xenstored/core.h} (100%)
rename tools/{xenstore/xenstored_domain.c => xenstored/domain.c} (99%)
rename tools/{xenstore/xenstored_domain.h => xenstored/domain.h} (100%)
rename tools/{xenstore => xenstored}/hashtable.c (100%)
rename tools/{xenstore => xenstored}/hashtable.h (100%)
rename tools/{xenstore => xenstored}/list.h (100%)
rename tools/{xenstore/xenstored_lu.c => xenstored/lu.c} (98%)
rename tools/{xenstore/xenstored_lu.h => xenstored/lu.h} (100%)
rename tools/{xenstore/xenstored_lu_daemon.c => xenstored/lu_daemon.c} (97%)
rename tools/{xenstore/xenstored_lu_minios.c => xenstored/lu_minios.c} (98%)
rename tools/{xenstore/xenstored_minios.c => xenstored/minios.c} (97%)
rename tools/{xenstore/xenstored_osdep.h => xenstored/osdep.h} (100%)
rename tools/{xenstore/xenstored_posix.c => xenstored/posix.c} (98%)
rename tools/{xenstore => xenstored}/talloc.c (100%)
rename tools/{xenstore => xenstored}/talloc.h (100%)
rename tools/{xenstore => xenstored}/talloc_guide.txt (100%)
rename tools/{xenstore/xenstored_transaction.c => xenstored/transaction.c} (99%)
rename tools/{xenstore/xenstored_transaction.h => xenstored/transaction.h} (98%)
rename tools/{xenstore => xenstored}/utils.c (100%)
rename tools/{xenstore => xenstored}/utils.h (100%)
rename tools/{xenstore/xenstored_watch.c => xenstored/watch.c} (98%)
rename tools/{xenstore/xenstored_watch.h => xenstored/watch.h} (98%)
rename tools/{xenstore/include => xenstored}/xenstore_state.h (100%)
create mode 100644 tools/xs-clients/.gitignore
rename tools/{xenstore => xs-clients}/Makefile (62%)
rename tools/{xenstore => xs-clients}/xenstore_client.c (100%)
rename tools/{xenstore => xs-clients}/xenstore_control.c (100%).gitignore +0 -11
@@ -237,17 +237,6 @@ tools/xenmon/xentrace_setmask tools/xenmon/xenbaked tools/xenpaging/xenpaging tools/xenpmd/xenpmd -tools/xenstore/xenstore -tools/xenstore/xenstore-chmod -tools/xenstore/xenstore-control -tools/xenstore/xenstore-exists -tools/xenstore/xenstore-list -tools/xenstore/xenstore-ls -tools/xenstore/xenstore-read -tools/xenstore/xenstore-rm -tools/xenstore/xenstore-watch -tools/xenstore/xenstore-write -tools/xenstore/xenstored tools/xentop/xentop tools/xentrace/xentrace_setsize tools/xentrace/tbctl
MAINTAINERS +2 -1
@@ -669,7 +669,8 @@ F: tools/include/xenstore.h F: tools/include/xenstore_lib.h F: tools/include/xen-tools/xenstore-common.h F: tools/libs/store/ -F: tools/xenstore/ +F: tools/xenstored/ +F: tools/xs-clients/ XENTRACE M: George Dunlap <[email protected]>
stubdom/Makefile +2 -2
@@ -371,10 +371,10 @@ endef $(foreach lib,$(STUB_LIBS),$(eval $(call BUILD_lib,$(lib)))) -xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common +xenstore/stamp: $(XEN_ROOT)/tools/xenstored/Makefile.common $(do_links) -xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common +xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstored/Makefile.common $(do_links) LINK_DIRS := xenstore xenstorepvh $(foreach dir,$(STUB_LIBS),libs-$(XEN_TARGET_ARCH)/$(dir))
tools/Makefile +2 -1
@@ -8,7 +8,8 @@ SUBDIRS-y := SUBDIRS-y += libs SUBDIRS-y += flask SUBDIRS-y += fuzz -SUBDIRS-y += xenstore +SUBDIRS-y += xs-clients +SUBDIRS-$(XENSTORE_XENSTORED) += xenstored SUBDIRS-y += misc SUBDIRS-y += examples SUBDIRS-y += hotplug
tools/xenstored/.gitignore new file +1 -0
@@ -0,0 +1 @@ +/xenstored
tools/xenstored/Makefile new file +48 -0
48 lines not on this page · raw message
tools/xenstored/Makefile.common renamed from tools/xenstore/Makefile.common +6 -7
@@ -1,17 +1,16 @@ # Makefile shared with stubdom -XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o -XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o xenstored_lu.o +XENSTORED_OBJS-y := core.o watch.o domain.o +XENSTORED_OBJS-y += transaction.o control.o lu.o XENSTORED_OBJS-y += talloc.o utils.o hashtable.o -XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o xenstored_lu_daemon.o -XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o xenstored_lu_daemon.o -XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o xenstored_lu_daemon.o -XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o xenstored_lu_minios.o +XENSTORED_OBJS-$(CONFIG_Linux) += posix.o lu_daemon.o +XENSTORED_OBJS-$(CONFIG_NetBSD) += posix.o lu_daemon.o +XENSTORED_OBJS-$(CONFIG_FreeBSD) += posix.o lu_daemon.o +XENSTORED_OBJS-$(CONFIG_MiniOS) += minios.o lu_minios.o # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS += -I./include CFLAGS += $(CFLAGS_libxenevtchn) CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenguest)
tools/xenstored/README renamed from tools/xenstore/README +0 -0
tools/xenstored/control.c renamed from tools/xenstore/xenstored_control.c +4 -4
@@ -27,10 +27,10 @@#include "utils.h" #include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_control.h" -#include "xenstored_domain.h" -#include "xenstored_lu.h" +#include "core.h" +#include "control.h" +#include "domain.h" +#include "lu.h" struct cmd_s {char *cmd;
tools/xenstored/control.h renamed from tools/xenstore/xenstored_control.h +0 -0
tools/xenstored/core.c renamed from tools/xenstore/xenstored_core.c +7 -7
@@ -47,12 +47,12 @@#include "utils.h" #include "list.h" #include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_watch.h" -#include "xenstored_transaction.h" -#include "xenstored_domain.h" -#include "xenstored_control.h" -#include "xenstored_lu.h" +#include "core.h" +#include "watch.h" +#include "transaction.h" +#include "domain.h" +#include "control.h" +#include "lu.h" #ifndef NO_SOCKETS #if defined(HAVE_SYSTEMD )
@@ -64,7 +64,7 @@#include <systemd/sd-daemon.h> #endif -extern xenevtchn_handle *xce_handle;/* in xenstored_domain.c */ +extern xenevtchn_handle *xce_handle;/* in domain.c */ static int xce_pollfd_idx =-1 ;static struct pollfd *fds;static unsigned int current_array_size;
tools/xenstored/core.h renamed from tools/xenstore/xenstored_core.h +0 -0
tools/xenstored/domain.c renamed from tools/xenstore/xenstored_domain.c +5 -5
@@ -27,11 +27,11 @@#include "utils.h" #include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_domain.h" -#include "xenstored_transaction.h" -#include "xenstored_watch.h" -#include "xenstored_control.h" +#include "core.h" +#include "domain.h" +#include "transaction.h" +#include "watch.h" +#include "control.h" #include <xenevtchn.h> #include <xenctrl.h>
tools/xenstored/domain.h renamed from tools/xenstore/xenstored_domain.h +0 -0
tools/xenstored/hashtable.c renamed from tools/xenstore/hashtable.c +0 -0
tools/xenstored/hashtable.h renamed from tools/xenstore/hashtable.h +0 -0
tools/xenstored/list.h renamed from tools/xenstore/list.h +0 -0
tools/xenstored/lu.c renamed from tools/xenstore/xenstored_lu.c +4 -4
@@ -13,10 +13,10 @@#include <time.h> #include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_domain.h" -#include "xenstored_lu.h" -#include "xenstored_watch.h" +#include "core.h" +#include "domain.h" +#include "lu.h" +#include "watch.h" #ifndef NO_LIVE_UPDATE struct live_update *lu_status;
tools/xenstored/lu.h renamed from tools/xenstore/xenstored_lu.h +0 -0
tools/xenstored/lu_daemon.c renamed from tools/xenstore/xenstored_lu_daemon.c +2 -2
@@ -13,8 +13,8 @@#include <xen-tools/xenstore-common.h> #include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_lu.h" +#include "core.h" +#include "lu.h" #ifndef NO_LIVE_UPDATE void lu_get_dump_state (struct lu_dump_state *state)
tools/xenstored/lu_minios.c renamed from tools/xenstore/xenstored_lu_minios.c +1 -1
@@ -14,7 +14,7 @@#include <xen-tools/common-macros.h> #include "talloc.h" -#include "xenstored_lu.h" +#include "lu.h" /* Mini-OS only knows about MAP_ANON. */ #ifndef MAP_ANONYMOUS
tools/xenstored/minios.c renamed from tools/xenstore/xenstored_minios.c +1 -1
@@ -17,7 +17,7 @@*/ #include <sys/types.h> #include <sys/mman.h> -#include "xenstored_core.h" +#include "core.h" #include <xen/grant_table.h> void write_pidfile (const char *pidfile)
tools/xenstored/osdep.h renamed from tools/xenstore/xenstored_osdep.h +0 -0
tools/xenstored/posix.c renamed from tools/xenstore/xenstored_posix.c +2 -2
@@ -24,8 +24,8 @@#include <sys/mman.h> #include "utils.h" -#include "xenstored_core.h" -#include "xenstored_osdep.h" +#include "core.h" +#include "osdep.h" void write_pidfile (const char *pidfile) {
tools/xenstored/talloc.c renamed from tools/xenstore/talloc.c +0 -0
tools/xenstored/talloc.h renamed from tools/xenstore/talloc.h +0 -0
tools/xenstored/talloc_guide.txt renamed from tools/xenstore/talloc_guide.txt +0 -0
tools/xenstored/transaction.c renamed from tools/xenstore/xenstored_transaction.c +3 -3
@@ -30,9 +30,9 @@#include <unistd.h> #include "talloc.h" #include "list.h" -#include "xenstored_transaction.h" -#include "xenstored_watch.h" -#include "xenstored_domain.h" +#include "transaction.h" +#include "watch.h" +#include "domain.h" #include "xenstore_lib.h" #include "utils.h"
tools/xenstored/transaction.h renamed from tools/xenstore/xenstored_transaction.h +1 -1
@@ -17,7 +17,7 @@*/ #ifndef _XENSTORED_TRANSACTION_H#define _XENSTORED_TRANSACTION_H -#include "xenstored_core.h" +#include "core.h" enum node_access_type { NODE_ACCESS_READ,
tools/xenstored/utils.c renamed from tools/xenstore/utils.c +0 -0
tools/xenstored/utils.h renamed from tools/xenstore/utils.h +0 -0
tools/xenstored/watch.c renamed from tools/xenstore/xenstored_watch.c +3 -3
@@ -25,11 +25,11 @@#include <assert.h> #include "talloc.h" #include "list.h" -#include "xenstored_watch.h" +#include "watch.h" #include "xenstore_lib.h" #include "utils.h" -#include "xenstored_domain.h" -#include "xenstored_transaction.h" +#include "domain.h" +#include "transaction.h" struct watch {
tools/xenstored/watch.h renamed from tools/xenstore/xenstored_watch.h +1 -1
@@ -19,7 +19,7 @@#ifndef _XENSTORED_WATCH_H#define _XENSTORED_WATCH_H -#include "xenstored_core.h" +#include "core.h" int do_watch (const void *ctx,struct connection *conn,struct buffered_data *in);
tools/xenstored/xenstore_state.h renamed from tools/xenstore/include/xenstore_state.h +0 -0
tools/xs-clients/.gitignore new file +10 -0
@@ -0,0 +1,10 @@ +/xenstore +/xenstore-chmod +/xenstore-control +/xenstore-exists +/xenstore-list +/xenstore-ls +/xenstore-read +/xenstore-rm +/xenstore-watch +/xenstore-write
tools/xs-clients/Makefile renamed from tools/xenstore/Makefile +5 -37
74 lines not on this page · raw message
tools/xs-clients/xenstore_client.c renamed from tools/xenstore/xenstore_client.c +0 -0
tools/xs-clients/xenstore_control.c renamed from tools/xenstore/xenstore_control.c +0 -0
Signature · 1 line
2.35.3