@@ -14,6 +14,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <pthread.h>
@@ -40,8 +41,6 @@
#define CM_REQ_DGID_POS 80
#define CM_SIDR_REQ_DGID_POS 44
-/* The below can be override by command line parameter */
-#define UNIX_SOCKET_PATH "/var/run/rdmacm-mux"
/* Has format %s-%s-%d" <path>-<rdma-dev--name>-<port> */
#define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2)
#define RDMA_PORT_NUM 1
@@ -77,7 +76,13 @@ typedef struct RdmaCmServer {
static RdmaCMServer server = {0};
-static void usage(const char *progname)
+static char *get_default_unix_socket_path(void)
+{
+ g_autofree char *run = qemu_get_runtime_dir();
+ return g_build_filename(run, "rdmacm-mux", NULL);
+}
+
+static void usage(const char *progname, const char *default_unix_socket_path)
{
printf("Usage: %s [OPTION]...\n"
"Start a RDMA-CM multiplexer\n"
@@ -86,7 +91,7 @@ static void usage(const char *progname)
"\t-d rdma-device-name Name of RDMA device to register with\n"
"\t-s unix-socket-path Path to unix socket to listen on (default %s)\n"
"\t-p rdma-device-port Port number of RDMA device to register with (default %d)\n",
- progname, UNIX_SOCKET_PATH, RDMA_PORT_NUM);
+ progname, default_unix_socket_path, RDMA_PORT_NUM);
}
static void help(const char *progname)
@@ -97,16 +102,16 @@ static void help(const char *progname)
static void parse_args(int argc, char *argv[])
{
int c;
- char unix_socket_path[SOCKET_PATH_MAX];
+ g_autofree char *default_unix_socket_path = get_default_unix_socket_path();
+ char *unix_socket_path = default_unix_socket_path;
strcpy(server.args.rdma_dev_name, "");
- strcpy(unix_socket_path, UNIX_SOCKET_PATH);
server.args.rdma_port_num = RDMA_PORT_NUM;
while ((c = getopt(argc, argv, "hs:d:p:")) != -1) {
switch (c) {
case 'h':
- usage(argv[0]);
+ usage(argv[0], default_unix_socket_path);
exit(0);
case 'd':
@@ -115,7 +120,7 @@ static void parse_args(int argc, char *argv[])
case 's':
/* This is temporary, final name will build below */
- strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX - 1);
+ unix_socket_path = optarg;
break;
case 'p':
@@ -811,6 +816,7 @@ int main(int argc, char *argv[])
{
int rc;
+ qemu_init_exec_dir(argv[0]);
memset(&server, 0, sizeof(server));
parse_args(argc, argv);
@@ -1,7 +1,7 @@
if have_pvrdma
# FIXME: broken on big endian architectures
executable('rdmacm-mux', files('main.c'), genh,
- dependencies: [glib, libumad],
+ dependencies: [glib, libumad, qemuutil],
build_by_default: false,
install: false)
endif
qemu_get_runtime_dir() is used to construct the default Unix socket path. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- contrib/rdmacm-mux/main.c | 22 ++++++++++++++-------- contrib/rdmacm-mux/meson.build | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-)