All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] cxenstored: avoid using hardcoded paths
@ 2015-10-13 13:40 Wei Liu
  2015-10-14 10:49 ` Ian Campbell
  0 siblings, 1 reply; 2+ messages in thread
From: Wei Liu @ 2015-10-13 13:40 UTC (permalink / raw)
  To: Xen-devel; +Cc: Wei Liu, Ian Jackson, Ian Campbell, Stefano Stabellini

Use library functions which return socket paths instead.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/xenstore/xenstored_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index eae4d31..bddec70 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1769,8 +1769,8 @@ static int xs_get_sd_fd(const char *connect_to)
 
 static int xs_validate_active_socket(const char *connect_to)
 {
-	if ((strcmp("/var/run/xenstored/socket_ro", connect_to) != 0) &&
-	    (strcmp("/var/run/xenstored/socket", connect_to) != 0)) {
+	if ((strcmp(xs_daemon_socket_ro(), connect_to) != 0) &&
+	    (strcmp(xs_daemon_socket(), connect_to) != 0)) {
 		sd_notifyf(0, "STATUS=unexpected socket: %s\n"
 			   "ERRNO=%i",
 			   connect_to,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] cxenstored: avoid using hardcoded paths
  2015-10-13 13:40 [PATCH] cxenstored: avoid using hardcoded paths Wei Liu
@ 2015-10-14 10:49 ` Ian Campbell
  0 siblings, 0 replies; 2+ messages in thread
From: Ian Campbell @ 2015-10-14 10:49 UTC (permalink / raw)
  To: Wei Liu, Xen-devel; +Cc: Ian Jackson, Stefano Stabellini

On Tue, 2015-10-13 at 14:40 +0100, Wei Liu wrote:
> Use library functions which return socket paths instead.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked + applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-14 10:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-13 13:40 [PATCH] cxenstored: avoid using hardcoded paths Wei Liu
2015-10-14 10:49 ` Ian Campbell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.