drop RO socket from oxenstored
cover drop RO socket from oxenstored
See https://lore.kernel.org/xen-devel/[email protected]/T/#u
Edwin Török (1):
tools/ocaml/xenstored: drop the creation of the RO socket
tools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/1 tools/ocaml/xenstored: drop the creation of the RO socket
The readonly flag was propagated but ignored, so this was essentially equivalent to a RW socket.
C xenstored is dropping the RO socket too, so drop it from oxenstored too.
--- tools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-)
tools/ocaml/xenstored/connections.ml +1 -1
@@ -31,7 +31,7 @@ let create () = { watches = Trie.create () } -let add_anonymous cons fd _can_write = +let add_anonymous cons fd = let xbcon = Xenbus.Xb.open_fd fd in let con = Connection.create xbcon None in Hashtbl.add cons.anonymous (Xenbus.Xb.get_fd xbcon) con
tools/ocaml/xenstored/define.ml +0 -1
@@ -18,7 +18,6 @@ let xenstored_major = 1 let xenstored_minor = 0 let xs_daemon_socket = Paths.xen_run_stored ^ "/socket" -let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro" let default_config_dir = Paths.xen_config_dir
tools/ocaml/xenstored/xenstored.ml +6 -9
@@ -242,12 +242,11 @@ let _ = () ); - let rw_sock, ro_sock = + let rw_sock = if cf.disable_socket then - None, None + None else - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket), - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket_ro) + Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket) in if cf.daemonize then
@@ -320,15 +319,14 @@ let _ = let spec_fds = (match rw_sock with None -> [] | Some x -> [ x ]) @ - (match ro_sock with None -> [] | Some x -> [ x ]) @ (if cf.domain_init then [ Event.fd eventchn ] else []) in let process_special_fds rset = - let accept_connection can_write fd = + let accept_connection fd = let (cfd, _addr) = Unix.accept fd in debug "new connection through socket"; - Connections.add_anonymous cons cfd can_write + Connections.add_anonymous cons cfd and handle_eventchn _fd = let port = Event.pending eventchn in debug "pending port %d" (Xeneventchn.to_int port);
@@ -348,8 +346,7 @@ let _ = if List.mem fd set then fct fd in - maybe (fun fd -> do_if_set fd rset (accept_connection true)) rw_sock; - maybe (fun fd -> do_if_set fd rset (accept_connection false)) ro_sock; + maybe (fun fd -> do_if_set fd rset accept_connection) rw_sock; do_if_set (Event.fd eventchn) rset (handle_eventchn) in
Signature · 1 line
2.25.1
Re: [PATCH v1 1/1] tools/ocaml/xenstored: drop the creation of the RO socket
--
________________________________________
From: Edwin Török <[email protected]>
Sent: 02 October 2020 17:06
To: [email protected]
Cc: Edwin Torok; Christian Lindig; David Scott; Ian Jackson; Wei Liu
Subject: [PATCH v1 1/1] tools/ocaml/xenstored: drop the creation of the RO socket
The readonly flag was propagated but ignored, so this was essentially equivalent to a RW socket.
C xenstored is dropping the RO socket too, so drop it from oxenstored too.
--- tools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-)
tools/ocaml/xenstored/connections.ml +1 -1
@@ -31,7 +31,7 @@ let create () = { watches = Trie.create () } -let add_anonymous cons fd _can_write = +let add_anonymous cons fd = let xbcon = Xenbus.Xb.open_fd fd in let con = Connection.create xbcon None in Hashtbl.add cons.anonymous (Xenbus.Xb.get_fd xbcon) con
tools/ocaml/xenstored/define.ml +0 -1
@@ -18,7 +18,6 @@ let xenstored_major = 1 let xenstored_minor = 0 let xs_daemon_socket = Paths.xen_run_stored ^ "/socket" -let xs_daemon_socket_ro = Paths.xen_run_stored ^ "/socket_ro" let default_config_dir = Paths.xen_config_dir
tools/ocaml/xenstored/xenstored.ml +6 -9
@@ -242,12 +242,11 @@ let _ = () ); - let rw_sock, ro_sock = + let rw_sock = if cf.disable_socket then - None, None + None else - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket), - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket_ro) + Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_socket) in if cf.daemonize then
@@ -320,15 +319,14 @@ let _ = let spec_fds = (match rw_sock with None -> [] | Some x -> [ x ]) @ - (match ro_sock with None -> [] | Some x -> [ x ]) @ (if cf.domain_init then [ Event.fd eventchn ] else []) in let process_special_fds rset = - let accept_connection can_write fd = + let accept_connection fd = let (cfd, _addr) = Unix.accept fd in debug "new connection through socket"; - Connections.add_anonymous cons cfd can_write + Connections.add_anonymous cons cfd and handle_eventchn _fd = let port = Event.pending eventchn in debug "pending port %d" (Xeneventchn.to_int port);
@@ -348,8 +346,7 @@ let _ = if List.mem fd set then fct fd in - maybe (fun fd -> do_if_set fd rset (accept_connection true)) rw_sock; - maybe (fun fd -> do_if_set fd rset (accept_connection false)) ro_sock; + maybe (fun fd -> do_if_set fd rset accept_connection) rw_sock; do_if_set (Event.fd eventchn) rset (handle_eventchn) in
--
2.25.1
Quoted 10 lines · Edwin Török
See https://lore.kernel.org/xen-devel/[email protected]/T/#u
Edwin Török (1):
tools/ocaml/xenstored: drop the creation of the RO sockettools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-)
FWIW:
Juergen
Wei Liu
AppliedQuoted 8 lines · Edwin Török
See https://lore.kernel.org/xen-devel/[email protected]/T/#u
Edwin Török (1):
tools/ocaml/xenstored: drop the creation of the RO sockettools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++---------
Applied.