[PATCH v5] 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.
Signed-off-by: Juergen Gross
---
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)
---
.gitignore| 22 -
MAINTAINERS | 3 +-
stubdom/Makefile | 4 +-
tools/Makefile| 3 +-
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/{xenstore => xs-clients}/Makefile | 30 ++--
.../xenstore_client.c | 0
.../xenstore_control.c| 0
36 files changed, 110 insertions(+), 81 deletions(-)
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%)
rename tools/{xenstore => xs-clients}/Makefile (74%)
rename tools/{xenstore => xs-clients}/xenstore_client.c (100%)
rename tools/{xenstore => xs-clients}/xenstore_control.c (100%)
diff --git a/.gitignore b/.gitignore
index c1b73b0968..c6489c4e70 100644
--- a/.gitignore
+++ b/.gi
Re: [PATCH v5] tools/xenstore: move xenstored sources into dedicated directory
On 18/08/2023 3:08 pm, Juergen Gross wrote: > diff --git a/.gitignore b/.gitignore > index c1b73b0968..c6489c4e70 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -237,22 +237,22 @@ 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/xenstored/xenstored > tools/xentop/xentop > tools/xentrace/xentrace_setsize > tools/xentrace/tbctl > tools/xentrace/xenctx > tools/xentrace/xentrace > +tools/xs-clients/xenstore > +tools/xs-clients/xenstore-chmod > +tools/xs-clients/xenstore-control > +tools/xs-clients/xenstore-exists > +tools/xs-clients/xenstore-list > +tools/xs-clients/xenstore-ls > +tools/xs-clients/xenstore-read > +tools/xs-clients/xenstore-rm > +tools/xs-clients/xenstore-watch > +tools/xs-clients/xenstore-write > xen/**/*.i > xen/**/*.s > xen/.banner Please take the opportunity to move these into local .gitignore files. One less area of churn in future renaming. Probably can be fixed on commit as its only mechanical. ~Andrew
Re: [PATCH v5] tools/xenstore: move xenstored sources into dedicated directory
Hi, On 18/08/2023 15:20, Andrew Cooper wrote: On 18/08/2023 3:08 pm, Juergen Gross wrote: diff --git a/.gitignore b/.gitignore index c1b73b0968..c6489c4e70 100644 --- a/.gitignore +++ b/.gitignore @@ -237,22 +237,22 @@ 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/xenstored/xenstored tools/xentop/xentop tools/xentrace/xentrace_setsize tools/xentrace/tbctl tools/xentrace/xenctx tools/xentrace/xentrace +tools/xs-clients/xenstore +tools/xs-clients/xenstore-chmod +tools/xs-clients/xenstore-control +tools/xs-clients/xenstore-exists +tools/xs-clients/xenstore-list +tools/xs-clients/xenstore-ls +tools/xs-clients/xenstore-read +tools/xs-clients/xenstore-rm +tools/xs-clients/xenstore-watch +tools/xs-clients/xenstore-write xen/**/*.i xen/**/*.s xen/.banner Please take the opportunity to move these into local .gitignore files. One less area of churn in future renaming. Probably can be fixed on commit as its only mechanical. If you end up to the be committer then sure. I would prefer not doing it while committing. Cheers, -- Julien Grall
Re: [PATCH v5] tools/xenstore: move xenstored sources into dedicated directory
Hi Juergen, On 18/08/2023 15:08, Juergen Gross wrote: 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. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Cheers, -- Julien Grall
Re: [PATCH v5] tools/xenstore: move xenstored sources into dedicated directory
On 21.08.23 09:59, Julien Grall wrote: Hi, On 18/08/2023 15:20, Andrew Cooper wrote: On 18/08/2023 3:08 pm, Juergen Gross wrote: diff --git a/.gitignore b/.gitignore index c1b73b0968..c6489c4e70 100644 --- a/.gitignore +++ b/.gitignore @@ -237,22 +237,22 @@ 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/xenstored/xenstored tools/xentop/xentop tools/xentrace/xentrace_setsize tools/xentrace/tbctl tools/xentrace/xenctx tools/xentrace/xentrace +tools/xs-clients/xenstore +tools/xs-clients/xenstore-chmod +tools/xs-clients/xenstore-control +tools/xs-clients/xenstore-exists +tools/xs-clients/xenstore-list +tools/xs-clients/xenstore-ls +tools/xs-clients/xenstore-read +tools/xs-clients/xenstore-rm +tools/xs-clients/xenstore-watch +tools/xs-clients/xenstore-write xen/**/*.i xen/**/*.s xen/.banner Please take the opportunity to move these into local .gitignore files. One less area of churn in future renaming. Probably can be fixed on commit as its only mechanical. If you end up to the be committer then sure. I would prefer not doing it while committing. I'll send a V6. Juergen OpenPGP_0xB0DE9DD628BF132F.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
