tools/xenstore: more cleanups
v4 cover tools/xenstore: more cleanups
Some more cleanups of Xenstore.
Changes in V2:
- rebase
- one small modification of patch 10
- added patches 11-13
Changes in V3:
- rebase
- modified patch 4
- added patches 10, 11 and 13
Changes in V4:
- patches 1-11 already committed
- modified patch 3
- rebased patch 4 after modifying patch 3
Juergen Gross (5):
tools/xenstore: remove no longer needed functions from xs_lib.c tools/xenstore: replace xs_lib.c with a header tools/xenstore: split out environment specific live update code tools/xenstore: split out rest of live update control code tools/xenstore: remove unused stuff from list.h
MAINTAINERS | 1 + tools/include/xen-tools/xenstore-common.h | 128 +++++ tools/include/xenstore.h | 3 + tools/include/xenstore_lib.h | 3 - tools/libs/store/Makefile | 4 - tools/libs/store/xs.c | 71 ++- tools/xenstore/COPYING | 514 ----------------- tools/xenstore/Makefile | 2 +- tools/xenstore/Makefile.common | 12 +- tools/xenstore/list.h | 227 -------- tools/xenstore/xenstore_client.c | 133 ++++- tools/xenstore/xenstored_control.c | 661 +--------------------- tools/xenstore/xenstored_control.h | 8 - tools/xenstore/xenstored_core.c | 19 +- tools/xenstore/xenstored_lu.c | 408 +++++++++++++ tools/xenstore/xenstored_lu.h | 81 +++ tools/xenstore/xenstored_lu_daemon.c | 130 +++++ tools/xenstore/xenstored_lu_minios.c | 118 ++++ tools/xenstore/xs_lib.c | 292 ---------- tools/xenstore/xs_lib.h | 50 -- 20 files changed, 1085 insertions(+), 1780 deletions(-) create mode 100644 tools/include/xen-tools/xenstore-common.h delete mode 100644 tools/xenstore/COPYING create mode 100644 tools/xenstore/xenstored_lu.c create mode 100644 tools/xenstore/xenstored_lu.h create mode 100644 tools/xenstore/xenstored_lu_daemon.c create mode 100644 tools/xenstore/xenstored_lu_minios.c delete mode 100644 tools/xenstore/xs_lib.c delete mode 100644 tools/xenstore/xs_lib.h
Signature · 1 line
2.35.3
PATCH v4 1/5 tools/xenstore: remove no longer needed functions from xs_lib.c
xs_daemon_tdb() in xs_lib.c is no longer used at all, so it can be removed. xs_domain_dev() and xs_write_all() are not used by xenstored, so they can be moved to tools/libs/store/xs.c.
xs_daemon_rootdir() is used by xenstored only and it only calls xs_daemon_rundir(), so replace its use cases with xs_daemon_rundir() and remove it from xs_lib.c.
xs_daemon_socket_ro() is needed in libxenstore only, so move it to tools/libs/store/xs.c.
Move functions used by xenstore-client only to xenstore_client.c.
---
V2:
- move xs_write_all(), too
V3:
- remove xs_daemon_rootdir(), move xs_daemon_socket_ro()
--- tools/include/xenstore.h | 3 + tools/include/xenstore_lib.h | 3 - tools/libs/store/xs.c | 43 ++++++++ tools/xenstore/xenstore_client.c | 129 ++++++++++++++++++++++ tools/xenstore/xenstored_control.c | 4 +- tools/xenstore/xenstored_core.c | 3 +- tools/xenstore/xs_lib.c | 166 ----------------------------- tools/xenstore/xs_lib.h | 19 ---- 8 files changed, 178 insertions(+), 192 deletions(-)
tools/include/xenstore.h +3 -0
@@ -113,6 +113,9 @@ void *xs_read(struct xs_handle *h, xs_transaction_t t,bool xs_write (struct xs_handle *h,xs_transaction_t t,const char *path,const void *data,unsigned int len); +/* Simple write function: loops for you. */ +bool xs_write_all (int fd,const void *data,unsigned int len); +/* Create a new directory. * Returns false on failure, or success if it already exists. */
tools/include/xenstore_lib.h +0 -3
@@ -47,9 +47,6 @@ const char *xs_daemon_rundir(void);const char *xs_daemon_socket (void );const char *xs_daemon_socket_ro (void ); -/* Simple write function: loops for you. */ -bool xs_write_all (int fd,const void *data,unsigned int len); -/* Convert strings to permissions. False if a problem. */ bool xs_strings_to_perms (struct xs_permissions *perms,unsigned int num,const char *strings);
tools/libs/store/xs.c +43 -0
61 lines not on this page · raw message
tools/xenstore/xenstore_client.c +129 -0
147 lines not on this page · raw message
tools/xenstore/xenstored_control.c +2 -2
@@ -560,7 +560,7 @@ static FILE *lu_dump_open(const void *ctx)char *filename;int fd; - filename =talloc_asprintf (ctx,"%s/state_dump" ,xs_daemon_rootdir ()); + filename =talloc_asprintf (ctx,"%s/state_dump" ,xs_daemon_rundir ());if (!filename)return NULL ;
@@ -583,7 +583,7 @@ static void lu_get_dump_state(struct lu_dump_state *state) state->size =0 ; state->filename =talloc_asprintf (NULL ,"%s/state_dump" , -xs_daemon_rootdir ()); +xs_daemon_rundir ());if (!state->filename)barf ("Allocation failure" );
tools/xenstore/xenstored_core.c +1 -2
@@ -2888,10 +2888,9 @@ int main(int argc, char *argv[])reopen_log (); -/* make sure xenstored directories exist */ +/* Make sure xenstored directory exists. */ /* Errors ignored here, will be reported when we open files */ mkdir (xs_daemon_rundir (),0755 ); -mkdir (xs_daemon_rootdir (),0755 );if (dofork) {openlog ("xenstored" ,0 ,LOG_DAEMON );
tools/xenstore/xs_lib.c +0 -166
186 lines not on this page · raw message
tools/xenstore/xs_lib.h +0 -19
@@ -21,10 +21,6 @@#include "xenstore_lib.h" -const char *xs_daemon_rootdir (void ); -const char *xs_domain_dev (void ); -const char *xs_daemon_tdb (void ); -/* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ bool xs_perm_to_string (const struct xs_permissions *perm,char *buffer,size_t buf_len);
@@ -32,19 +28,4 @@ bool xs_perm_to_string(const struct xs_permissions *perm,/* Given a string and a length, count how many strings (nul terms). */ unsigned int xs_count_strings (const char *strings,unsigned int len); -/* Sanitising (quoting) possibly-binary strings. */ -struct expanding_buffer { -char *buf; -int avail; -}; - -/* Ensure that given expanding buffer has at least min_avail characters. */ -char *expanding_buffer_ensure (struct expanding_buffer *,int min_avail); - -/* sanitise_value() may return NULL if malloc fails. */ -char *sanitise_value (struct expanding_buffer *,const char *val,unsigned len); - -/* *out_len_r on entry is ignored; out must be at least strlen(in)+1 bytes. */ -void unsanitise_value (char *out,unsigned *out_len_r,const char *in); -#endif /* XS_LIB_H */
Signature · 1 line
2.35.3
PATCH v4 2/5 tools/xenstore: replace xs_lib.c with a header
In reply to Juergen GrossInstead of including the same small C source in multiple binaries from 2 source directories, use a header file with inline functions as a replacement.
As some of the functions are exported by libxenstore, rename the inline functions from xs_*() do xenstore_*() and add xs_*() wrappers to libxenstore.
With that no sources required to build libxenstore are left in tools/xenstore, so the file COPYING can be removed now.
---
V3:
- new patch
--- MAINTAINERS | 1 + tools/include/xen-tools/xenstore-common.h | 128 ++++++ tools/libs/store/Makefile | 4 - tools/libs/store/xs.c | 28 +- tools/xenstore/COPYING | 514 ---------------------- tools/xenstore/Makefile | 2 +- tools/xenstore/Makefile.common | 2 +- tools/xenstore/xenstore_client.c | 4 +- tools/xenstore/xenstored_control.c | 9 +- tools/xenstore/xenstored_core.c | 15 +- tools/xenstore/xs_lib.c | 126 ------ tools/xenstore/xs_lib.h | 31 -- 12 files changed, 168 insertions(+), 696 deletions(-) create mode 100644 tools/include/xen-tools/xenstore-common.h delete mode 100644 tools/xenstore/COPYING delete mode 100644 tools/xenstore/xs_lib.c delete mode 100644 tools/xenstore/xs_lib.h
MAINTAINERS +1 -0
@@ -656,6 +656,7 @@ F: tools/helpers/init-xenstore-domain.c F: tools/include/xenstore-compat/ 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/
tools/include/xen-tools/xenstore-common.h new file +128 -0
128 lines not on this page · raw message
tools/libs/store/Makefile +0 -4
@@ -9,7 +9,6 @@ ifeq ($(CONFIG_Linux),y) LDLIBS += -ldl endif -OBJS-y += xs_lib.o OBJS-y += xs.o LIBHEADER = xenstore.h xenstore_lib.h
@@ -21,9 +20,6 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h CFLAGS += $(CFLAGS_libxentoolcore) CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" -vpath xs_lib.c $(XEN_ROOT)/tools/xenstore -CFLAGS += -iquote $(XEN_ROOT)/tools/xenstore - xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) xs.opic: CFLAGS += -DUSE_DLSYM
tools/libs/store/xs.c +22 -6
@@ -34,8 +34,8 @@#include <stdint.h> #include <errno.h> #include <xen-tools/common-macros.h> +#include <xen-tools/xenstore-common.h> #include "xenstore.h" -#include "xs_lib.h" #include <xentoolcore_internal.h> #include <xen_list.h>
@@ -627,7 +627,7 @@ static char **xs_directory_common(char *strings, unsigned int len,char *p, **ret;/* Count the strings. */ - *num =xs_count_strings (strings, len); + *num =xenstore_count_strings (strings, len);/* Transfer to one big alloc for easy freeing. */ ret =malloc (*num *sizeof (char *) + len);
@@ -775,7 +775,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h,return NULL ;/* Count the strings: each one perms then domid. */ - *num =xs_count_strings (strings, len); + *num =xenstore_count_strings (strings, len);/* Transfer to one big alloc for easy freeing. */ ret =malloc (*num *sizeof (struct xs_permissions ));
@@ -784,7 +784,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h,return NULL ; } -if (!xs_strings_to_perms (ret, *num, strings)) { +if (!xenstore_strings_to_perms (ret, *num, strings)) {free_no_errno (ret); ret =NULL ; }
@@ -811,7 +811,7 @@ bool xs_set_permissions(struct xs_handle *h,for (i =0 ; i < num_perms; i++) { char buffer[MAX_STRLEN(unsigned int)+1]; -if (!xs_perm_to_string (&perms[i], buffer,sizeof (buffer))) +if (!xenstore_perm_to_string (&perms[i], buffer,sizeof (buffer))) goto unwind; iov[i+1 ].iov_base =strdup (buffer);
@@ -977,7 +977,7 @@ static char **read_watch_internal(struct xs_handle *h, unsigned int *num,assert (msg->hdr.type ==XS_WATCH_EVENT ); strings = msg->body; - num_strings =xs_count_strings (strings, msg->hdr.len); + num_strings =xenstore_count_strings (strings, msg->hdr.len); ret =malloc (sizeof (char *) * num_strings + msg->hdr.len);if (!ret) {
@@ -1366,11 +1366,27 @@ error:return ret; } +const char *xs_daemon_socket (void ) +{ +return xenstore_daemon_path (); +} +const char *xs_daemon_socket_ro (void ) {return xs_daemon_socket (); } +const char *xs_daemon_rundir (void ) +{ +return xenstore_daemon_rundir (); +} + +bool xs_strings_to_perms (struct xs_permissions *perms,unsigned int num, +const char *strings) +{ +return xenstore_strings_to_perms (perms, num, strings); +} +#ifdef USE_PTHREAD static void *read_thread (void *arg) {
tools/xenstore/COPYING deleted +0 -514
514 lines not on this page · raw message
tools/xenstore/Makefile +1 -1
@@ -44,7 +44,7 @@ xenstored: $(XENSTORED_OBJS-y) $(CLIENTS): xenstore ln -f xenstore $@ -xenstore: xenstore_client.o xs_lib.o +xenstore: xenstore_client.o $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o
tools/xenstore/Makefile.common +1 -1
@@ -2,7 +2,7 @@ XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o -XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o +XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o
tools/xenstore/xenstore_client.c +2 -2
@@ -23,7 +23,7 @@#include <sys/ioctl.h> -#include "xs_lib.h" +#include <xen-tools/xenstore-common.h> #define PATH_SEP '/'#define MAX_PATH_LEN 256
@@ -361,7 +361,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_permsfor (i =0 ; i < nperms; i++) {if (i)putchar (',' ); -xs_perm_to_string (perms+i, buf,sizeof (buf)); +xenstore_perm_to_string (perms+i, buf,sizeof (buf));fputs (buf, stdout); }putchar (')' );
tools/xenstore/xenstored_control.c +5 -4
@@ -31,10 +31,10 @@#include <fcntl.h> #include <unistd.h> #include <xenctrl.h> +#include <xen-tools/xenstore-common.h> #include "utils.h" #include "talloc.h" -#include "xs_lib.h" #include "xenstored_core.h" #include "xenstored_control.h" #include "xenstored_domain.h"
@@ -560,7 +560,8 @@ static FILE *lu_dump_open(const void *ctx)char *filename;int fd; - filename =talloc_asprintf (ctx,"%s/state_dump" ,xs_daemon_rundir ()); + filename =talloc_asprintf (ctx,"%s/state_dump" , +xenstore_daemon_rundir ());if (!filename)return NULL ;
@@ -583,7 +584,7 @@ static void lu_get_dump_state(struct lu_dump_state *state) state->size =0 ; state->filename =talloc_asprintf (NULL ,"%s/state_dump" , -xs_daemon_rundir ()); +xenstore_daemon_rundir ());if (!state->filename)barf ("Allocation failure" );
@@ -1017,7 +1018,7 @@ int do_control(const void *ctx, struct connection *conn,if (cmd ==ARRAY_SIZE (cmds))return EINVAL ; - num =xs_count_strings (in->buffer, in->used); + num =xenstore_count_strings (in->buffer, in->used);if (cmds[cmd].max_pars) num =min (num, cmds[cmd].max_pars); vec = talloc_array(ctx, char *, num);
tools/xenstore/xenstored_core.c +8 -7
@@ -42,11 +42,11 @@#include <setjmp.h> #include <xenevtchn.h> +#include <xen-tools/xenstore-common.h> #include "utils.h" #include "list.h" #include "talloc.h" -#include "xs_lib.h" #include "xenstored_core.h" #include "xenstored_watch.h" #include "xenstored_transaction.h"
@@ -1201,7 +1201,8 @@ static char *perms_to_strings(const void *ctx, const struct node_perms *perms, char buffer[MAX_STRLEN(unsigned int) + 1];for (*len =0 , i =0 ; i < perms->num; i++) { -if (!xs_perm_to_string (&perms->p[i], buffer,sizeof (buffer))) +if (!xenstore_perm_to_string (&perms->p[i], buffer, +sizeof (buffer)))return NULL ; strings = talloc_realloc(ctx, strings, char,
@@ -1279,7 +1280,7 @@ static int send_directory_part(const void *ctx, struct connection *conn,struct node *node;char gen[24 ]; -if (xs_count_strings (in->buffer, in->used) !=2 ) +if (xenstore_count_strings (in->buffer, in->used) !=2 )return EINVAL ;/* First arg is node name. */
@@ -1766,7 +1767,7 @@ static int do_set_perms(const void *ctx, struct connection *conn,char *name, *permstr;struct node *node; - perms.num =xs_count_strings (in->buffer, in->used); + perms.num =xenstore_count_strings (in->buffer, in->used);if (perms.num <2 )return EINVAL ;
@@ -1779,7 +1780,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, perms.p = talloc_array(ctx, struct xs_permissions, perms.num);if (!perms.p)return ENOMEM ; -if (!xs_strings_to_perms (perms.p, perms.num, permstr)) +if (!xenstore_strings_to_perms (perms.p, perms.num, permstr))return errno;if (domain_alloc_permrefs (&perms) <0 )
@@ -2575,7 +2576,7 @@ static void destroy_fds(void)static void init_sockets (void ) {struct sockaddr_un addr; -const char *soc_str =xs_daemon_socket (); +const char *soc_str =xenstore_daemon_path ();if (!soc_str)barf_perror ("Failed to obtain xs domain socket" );
@@ -2890,7 +2891,7 @@ int main(int argc, char *argv[])/* Make sure xenstored directory exists. */ /* Errors ignored here, will be reported when we open files */ -mkdir (xs_daemon_rundir (),0755 ); +mkdir (xenstore_daemon_rundir (),0755 );if (dofork) {openlog ("xenstored" ,0 ,LOG_DAEMON );
tools/xenstore/xs_lib.c deleted +0 -126
126 lines not on this page · raw message
tools/xenstore/xs_lib.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* -Common routines between Xen store user library and daemon. -Copyright (C) 2005 Rusty Russell IBM Corporation - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef XS_LIB_H -#define XS_LIB_H - -#include "xenstore_lib.h" - -/* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ -bool xs_perm_to_string (const struct xs_permissions *perm, -char *buffer,size_t buf_len); - -/* Given a string and a length, count how many strings (nul terms). */ -unsigned int xs_count_strings (const char *strings,unsigned int len); - -#endif /* XS_LIB_H */
Signature · 1 line
2.35.3
PATCH v4 3/5 tools/xenstore: split out environment specific live update code
In reply to Juergen GrossInstead of using #ifdef in xenstored_control.c split out the code of environment specific functions (daemon or Mini-OS) to dedicated source files.
---
V4:
- split lu_destroy() in common and specific parts (Julien Grall)
--- tools/xenstore/Makefile.common | 8 +- tools/xenstore/xenstored_control.c | 247 +-------------------------- tools/xenstore/xenstored_lu.h | 56 ++++++ tools/xenstore/xenstored_lu_daemon.c | 130 ++++++++++++++ tools/xenstore/xenstored_lu_minios.c | 118 +++++++++++++ 5 files changed, 312 insertions(+), 247 deletions(-) create mode 100644 tools/xenstore/xenstored_lu.h create mode 100644 tools/xenstore/xenstored_lu_daemon.c create mode 100644 tools/xenstore/xenstored_lu_minios.c
tools/xenstore/Makefile.common +4 -4
@@ -4,10 +4,10 @@ XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o -XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.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 # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h
tools/xenstore/xenstored_control.c +4 -243
270 lines not on this page · raw message
tools/xenstore/xenstored_lu.h new file +56 -0
56 lines not on this page · raw message
tools/xenstore/xenstored_lu_daemon.c new file +130 -0
130 lines not on this page · raw message
tools/xenstore/xenstored_lu_minios.c new file +118 -0
118 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH v4 3/5] tools/xenstore: split out environment specific live update code
Hi Juergen,
Quoted 5 lines · Juergen Gross
Instead of using #ifdef in
xenstored_control.csplit out the code of environment specific functions (daemon or Mini-OS) to dedicated source files.Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
PATCH v4 4/5 tools/xenstore: split out rest of live update control code
In reply to Juergen GrossMove the rest of live update related code from xenstored_control.c to a dedicated new source file.
--- tools/xenstore/Makefile.common | 2 +- tools/xenstore/xenstored_control.c | 417 ----------------------------- tools/xenstore/xenstored_control.h | 8 - tools/xenstore/xenstored_core.c | 1 + tools/xenstore/xenstored_lu.c | 408 ++++++++++++++++++++++++++++ tools/xenstore/xenstored_lu.h | 25 ++ 6 files changed, 435 insertions(+), 426 deletions(-) create mode 100644 tools/xenstore/xenstored_lu.c
tools/xenstore/Makefile.common +1 -1
@@ -1,7 +1,7 @@ # 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_OBJS-y += xenstored_transaction.o xenstored_control.o xenstored_lu.o XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o xenstored_lu_daemon.o
tools/xenstore/xenstored_control.c +0 -417
442 lines not on this page · raw message
tools/xenstore/xenstored_control.h +0 -8
@@ -18,11 +18,3 @@int do_control (const void *ctx,struct connection *conn,struct buffered_data *in); -void lu_read_state (void ); - -struct connection *lu_get_connection (void ); - -/* Write the "OK" response for the live-update command */ -unsigned int lu_write_response (FILE *fp); - -bool lu_is_pending (void );
tools/xenstore/xenstored_core.c +1 -0
@@ -52,6 +52,7 @@#include "xenstored_transaction.h" #include "xenstored_domain.h" #include "xenstored_control.h" +#include "xenstored_lu.h" #include "tdb.h" #ifndef NO_SOCKETS
tools/xenstore/xenstored_lu.c new file +408 -0
408 lines not on this page · raw message
tools/xenstore/xenstored_lu.h +25 -0
@@ -43,6 +43,16 @@ struct lu_dump_state {extern struct live_update *lu_status; +struct connection *lu_get_connection (void ); +bool lu_is_pending (void ); +void lu_read_state (void ); + +/* Write the "OK" response for the live-update command */ +unsigned int lu_write_response (FILE *fp); + +int do_control_lu (const void *ctx,struct connection *conn,char **vec, +int num); +/* Live update private interfaces. */ void lu_get_dump_state (struct lu_dump_state *state);void lu_close_dump_state (struct lu_dump_state *state);
@@ -53,4 +63,19 @@ const char *lu_arch(const void *ctx, struct connection *conn, char **vec, int num);const char *lu_begin (struct connection *conn);void lu_destroy_arch (void *data); +#else +static inline struct connection *lu_get_connection (void ) +{ +return NULL ; +} + +static inline unsigned int lu_write_response (FILE *fp) +{ +return 0 ; +} + +static inline bool lu_is_pending (void ) +{ +return false; +}#endif
Signature · 1 line
2.35.3
Re: [PATCH v4 4/5] tools/xenstore: split out rest of live update control code
Hi Juergen,
Quoted 4 lines · Juergen Gross
Move the rest of live update related code from
xenstored_control.cto a dedicated new source file.Signed-off-by Juergen Gross <[email protected]>
Cheers,
Signature · 1 line
Julien Grall
PATCH v4 5/5 tools/xenstore: remove unused stuff from list.h
In reply to Juergen GrossRemove the hlist defines/functions and the rcu related functions from tools/xenstore/list.h, as they are not used.
--- tools/xenstore/list.h | 227 ------------------------------------------ 1 file changed, 227 deletions(-)
tools/xenstore/list.h +0 -227
@@ -88,48 +88,6 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)__list_add (new, head->prev, head); } -/* -* Insert a new entry between two known consecutive entries. -* -* This is only for internal list manipulation where we know -* the prev/next entries already! -*/ -static __inline__void __list_add_rcu (struct list_head * new, -struct list_head * prev, -struct list_head * next) -{ - new->next = next; - new->prev = prev; - next->prev = new; - prev->next = new; -} - -/** -* list_add_rcu - add a new entry to rcu-protected list -* @new: new entry to be added -* @head: list head to add it after -* -* Insert a new entry after the specified head. -* This is good for implementing stacks. -*/ -static __inline__void list_add_rcu (struct list_head *new,struct list_head *head) -{ -__list_add_rcu (new, head, head->next); -} - -/** -* list_add_tail_rcu - add a new entry to rcu-protected list -* @new: new entry to be added -* @head: list head to add it before -* -* Insert a new entry before the specified head. -* This is useful for implementing queues. -*/ -static __inline__void list_add_tail_rcu (struct list_head *new,struct list_head *head) -{ -__list_add_rcu (new, head->prev, head); -} -/* * Delete a list entry by making the prev/next entries * point to each other.
@@ -156,23 +114,6 @@ static inline void list_del(struct list_head *entry) entry->prev =LIST_POISON2 ; } -/** -* list_del_rcu - deletes entry from list without re-initialization -* @entry: the element to delete from the list. -* -* Note: list_empty on entry does not return true after this, -* the entry is in an undefined state. It is useful for RCU based -* lockfree traversal. -* -* In particular, it means that we can not poison the forward -* pointers that may still be used for walking the list. -*/ -static inline void list_del_rcu (struct list_head *entry) -{ -__list_del (entry->prev, entry->next); - entry->prev =LIST_POISON2 ; -} -/** * list_del_init - deletes entry from list and reinitialize it. * @entry: the element to delete from the list.
@@ -339,172 +280,4 @@ static inline void list_splice_init(struct list_head *list, &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) - -/* -* Double linked lists with a single pointer list head. -* Mostly useful for hash tables where the two pointer list head is -* too wasteful. -* You lose the ability to access the tail in O(1). -*/ - -struct hlist_head { -struct hlist_node *first; -}; - -struct hlist_node { -struct hlist_node *next, **pprev; -}; - -#define HLIST_HEAD_INIT { .first = NULL } -#define HLIST_HEAD (name) struct hlist_head name = { .first = NULL } -#define INIT_HLIST_HEAD (ptr) ((ptr)->first = NULL) -#define INIT_HLIST_NODE (ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL) - -static __inline__int hlist_unhashed (struct hlist_node *h) -{ -return !h->pprev; -} - -static __inline__int hlist_empty (struct hlist_head *h) -{ -return !h->first; -} - -static __inline__void __hlist_del (struct hlist_node *n) -{ -struct hlist_node *next = n->next; -struct hlist_node **pprev = n->pprev; - *pprev = next; -if (next) - next->pprev = pprev; -} - -static __inline__void hlist_del (struct hlist_node *n) -{ -__hlist_del (n); - n->next =LIST_POISON1 ; - n->pprev =LIST_POISON2 ; -} - -/** -* hlist_del_rcu - deletes entry from hash list without re-initialization -* @entry: the element to delete from the hash list. -* -* Note: list_unhashed() on entry does not return true after this, -* the entry is in an undefined state. It is useful for RCU based -* lockfree traversal. -* -* In particular, it means that we can not poison the forward -* pointers that may still be used for walking the hash list. -*/ -static inline void hlist_del_rcu (struct hlist_node *n) -{ -__hlist_del (n); - n->pprev =LIST_POISON2 ; -} - -static __inline__void hlist_del_init (struct hlist_node *n) -{ -if (n->pprev) { -__hlist_del (n); -INIT_HLIST_NODE (n); - } -} - -#define hlist_del_rcu_init hlist_del_init - -static __inline__void hlist_add_head (struct hlist_node *n,struct hlist_head *h) -{ -struct hlist_node *first = h->first; - n->next = first; -if (first) - first->pprev = &n->next; - h->first = n; - n->pprev = &h->first; -} - -static __inline__void hlist_add_head_rcu (struct hlist_node *n,struct hlist_head *h) -{ -struct hlist_node *first = h->first; - n->next = first; - n->pprev = &h->first; -if (first) - first->pprev = &n->next; - h->first = n; -} - -/* next must be != NULL */ -static __inline__void hlist_add_before (struct hlist_node *n,struct hlist_node *next) -{ - n->pprev = next->pprev; - n->next = next; - next->pprev = &n->next; - *(n->pprev) = n; -} - -static __inline__void hlist_add_after (struct hlist_node *n, -struct hlist_node *next) -{ - next->next = n->next; - *(next->pprev) = n; - n->next = next; -} - -#define hlist_entry (ptr, type, member) container_of(ptr,type,member) - -/* Cannot easily do prefetch unfortunately */ -#define hlist_for_each (pos, head) \ - for (pos = (head)->first; pos; pos = pos->next) - -#define hlist_for_each_safe (pos, n, head) \ - for (pos = (head)->first; n = pos ? pos->next : 0, pos; \ - pos = n) - -/** -* hlist_for_each_entry - iterate over list of given type -* @tpos: the type * to use as a loop counter. -* @pos: the &struct hlist_node to use as a loop counter. -* @head: the head for your list. -* @member: the name of the hlist_node within the struct. -*/ -#define hlist_for_each_entry (tpos, pos, head, member) \ - for (pos = (head)->first; \ - pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** -* hlist_for_each_entry_continue - iterate over a hlist continuing after existing point -* @tpos: the type * to use as a loop counter. -* @pos: the &struct hlist_node to use as a loop counter. -* @member: the name of the hlist_node within the struct. -*/ -#define hlist_for_each_entry_continue (tpos, pos, member) \ - for (pos = (pos)->next; \ - pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** -* hlist_for_each_entry_from - iterate over a hlist continuing from existing point -* @tpos: the type * to use as a loop counter. -* @pos: the &struct hlist_node to use as a loop counter. -* @member: the name of the hlist_node within the struct. -*/ -#define hlist_for_each_entry_from (tpos, pos, member) \ - for (; pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** -* hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry -* @tpos: the type * to use as a loop counter. -* @pos: the &struct hlist_node to use as a loop counter. -* @n: another &struct hlist_node to use as temporary storage -* @head: the head for your list. -* @member: the name of the hlist_node within the struct. -*/ -#define hlist_for_each_entry_safe (tpos, pos, n, head, member) \ - for (pos = (head)->first; \ - pos && ({ n = pos->next; 1; }) && \ - ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = n) -#endif
Signature · 1 line
2.35.3
Hi Juergen,
Quoted 17 lines · Juergen Gross
Some more cleanups of Xenstore.
Changes in V2:
- rebase
- one small modification of patch 10
- added patches 11-13Changes in V3:
- rebase
- modified patch 4
- added patches 10, 11 and 13Changes in V4:
- patches 1-11 already committed
- modified patch 3
- rebased patch 4 after modifying patch 3
Quoted 6 lines
Juergen Gross (5):
tools/xenstore: remove no longer needed functions fromxs_lib.ctools/xenstore: replacexs_lib.cwith a headertools/xenstore: split out environment specific live update codetools/xenstore: split out rest of live update control codetools/xenstore: remove unused stuff fromlist.h
I have committed the series.
Cheers,
Signature · 1 line
Julien Grall