Re: [PATCH v4 19/19] tools/xenstore: move xenstored sources into dedicated directory
On 18.08.23 14:42, Julien Grall wrote: Hi Juergen, On 18/08/2023 13:14, Juergen Gross wrote: On 18.08.23 13:22, Julien Grall wrote: Hi Juergen, On 14/08/2023 08:47, 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 term of naming, I would prefer if we follow what was done for the console. I.e: xenstore/client: All the clients xenstore/daemon: C Xenstored This would avoid the one character difference between the two directories. Yes, that would be the alternative (apart from renaming the xenstore directory to something different, e.g. xs-clients). xs-clients would be OK. I guess you didn't suggest xenstore-clients because it is too long? I was more thinking about path name completion when typing. Using xs-clients would allow to use the after the second character already. :-) The reason I was leaning towards my solution was that the clients are meant to be used with any xenstored implementation. This wouldn't be reflected by using a common tools/xenstore parent directory for the clients and C xenstored. You have a point. I was also trying to avoid to have too many directoy in tools. But we already have 'qemu-trad' and 'qemu-upstream'... In the end I could live with your proposal, too. My main concern with your proposal was the one character difference in the name. xenstored and xs-clients/xenstore-clients would work for me. Okay, thanks. With above reasoning I'm leaning towards xs-clients. Juergen OpenPGP_0xB0DE9DD628BF132F.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Re: [PATCH v4 19/19] tools/xenstore: move xenstored sources into dedicated directory
Hi Juergen, On 18/08/2023 13:14, Juergen Gross wrote: On 18.08.23 13:22, Julien Grall wrote: Hi Juergen, On 14/08/2023 08:47, 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 term of naming, I would prefer if we follow what was done for the console. I.e: xenstore/client: All the clients xenstore/daemon: C Xenstored This would avoid the one character difference between the two directories. Yes, that would be the alternative (apart from renaming the xenstore directory to something different, e.g. xs-clients). xs-clients would be OK. I guess you didn't suggest xenstore-clients because it is too long? The reason I was leaning towards my solution was that the clients are meant to be used with any xenstored implementation. This wouldn't be reflected by using a common tools/xenstore parent directory for the clients and C xenstored. You have a point. I was also trying to avoid to have too many directoy in tools. But we already have 'qemu-trad' and 'qemu-upstream'... In the end I could live with your proposal, too. My main concern with your proposal was the one character difference in the name. xenstored and xs-clients/xenstore-clients would work for me. Cheers, -- Julien Grall
Re: [PATCH v4 19/19] tools/xenstore: move xenstored sources into dedicated directory
On 18.08.23 13:22, Julien Grall wrote: Hi Juergen, On 14/08/2023 08:47, 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 term of naming, I would prefer if we follow what was done for the console. I.e: xenstore/client: All the clients xenstore/daemon: C Xenstored This would avoid the one character difference between the two directories. Yes, that would be the alternative (apart from renaming the xenstore directory to something different, e.g. xs-clients). The reason I was leaning towards my solution was that the clients are meant to be used with any xenstored implementation. This wouldn't be reflected by using a common tools/xenstore parent directory for the clients and C xenstored. In the end I could live with your proposal, too. What do the other thinks? 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. +1. Thanks, Juergen OpenPGP_0xB0DE9DD628BF132F.asc Description: OpenPGP public key OpenPGP_signature.asc Description: OpenPGP digital signature
Re: [PATCH v4 19/19] tools/xenstore: move xenstored sources into dedicated directory
Hi Juergen, On 14/08/2023 08:47, 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 term of naming, I would prefer if we follow what was done for the console. I.e: xenstore/client: All the clients xenstore/daemon: C Xenstored This would avoid the one character difference between the two directories. What do the other thinks? 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. +1. Cheers, -- Julien Grall
[PATCH v4 19/19] 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.
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
---
.gitignore| 2 +-
MAINTAINERS | 1 +
stubdom/Makefile | 4 +-
tools/Makefile| 1 +
tools/xenstore/Makefile | 30 ++--
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
34 files changed, 98 insertions(+), 69 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%)
diff --git a/.gitignore b/.gitignore
index c1b73b0968..4314e4e7e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,7 +247,7 @@ 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
diff --git a/MAINTAINERS b/MAINTAINERS
index a0805d35cd..25493999ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -670,6 +670,7 @@ F: tools/include/xenstore_lib.h
F:
