xenstored: unify xenstored OS-specific bits

The Solaris implementation seems too different, so this patch only
folds both the Linux and NetBSD implementations.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index b626104d22dbc236d77283bfbd4cc1bc4b813717..c0c7bb2ece77e2d764a41f23aecd889cd447963a 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -13,9 +13,9 @@ CLIENTS += xenstore-write xenstore-ls xenstore-watch
 
 XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o tdb.o hashtable.o
 
-XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_linux.o xenstored_posix.o
+XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_posix.o
 XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o xenstored_posix.o xenstored_probes.o
-XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_netbsd.o xenstored_posix.o
+XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_posix.o
 XENSTORED_OBJS_$(CONFIG_MiniOS) = xenstored_minios.o
 
 XENSTORED_OBJS += $(XENSTORED_OBJS_y)

diff --git a/tools/xenstore/xenstored_linux.c b/tools/xenstore/xenstored_linux.c
deleted file mode 100644 (file)
index cf40213..0000000
--- a/tools/xenstore/xenstored_linux.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (C) 2005 Rusty Russell IBM Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2 of the
- * License.
- */
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-
-#include "xenstored_core.h"
-
-#define XENSTORED_PROC_KVA  "/proc/xen/xsd_kva"
-#define XENSTORED_PROC_PORT "/proc/xen/xsd_port"
-
-evtchn_port_t xenbus_evtchn(void)
-{
-       int fd;
-       int rc;
-       evtchn_port_t port; 
-       char str[20]; 
-
-       fd = open(XENSTORED_PROC_PORT, O_RDONLY); 
-       if (fd == -1)
-               return -1;
-
-       rc = read(fd, str, sizeof(str) - 1);
-       if (rc == -1)
-       {
-               int err = errno;
-               close(fd);
-               errno = err;
-               return -1;
-       }
-
-       str[rc] = '\0'; 
-       port = strtoul(str, NULL, 0); 
-
-       close(fd); 
-       return port;
-}
-
-void *xenbus_map(void)
-{
-       int fd;
-       void *addr;
-
-       fd = open(XENSTORED_PROC_KVA, O_RDWR);
-       if (fd == -1)
-               return NULL;
-
-       addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE,
-               MAP_SHARED, fd, 0);
-
-       if (addr == MAP_FAILED)
-               addr = NULL;
-
-       close(fd);
-
-       return addr;
-}
-
-void xenbus_notify_running(void)
-{
-}

diff --git a/tools/xenstore/xenstored_netbsd.c b/tools/xenstore/xenstored_netbsd.c
deleted file mode 100644 (file)
index 1e94e41..0000000
--- a/tools/xenstore/xenstored_netbsd.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (C) 2005 Rusty Russell IBM Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, version 2 of the
- * License.
- */
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-
-#include "xenstored_core.h"
-
-#define XENSTORED_PROC_KVA  "/dev/xsd_kva"
-#define XENSTORED_PROC_PORT "/kern/xen/xsd_port"
-
-evtchn_port_t xenbus_evtchn(void)
-{
-       int fd;
-       int rc;
-       evtchn_port_t port; 
-       char str[20]; 
-
-       fd = open(XENSTORED_PROC_PORT, O_RDONLY); 
-       if (fd == -1)
-               return -1;
-
-       rc = read(fd, str, sizeof(str)); 
-       if (rc == -1)
-       {
-               int err = errno;
-               close(fd);
-               errno = err;
-               return -1;
-       }
-
-       str[rc] = '\0'; 
-       port = strtoul(str, NULL, 0); 
-
-       close(fd); 
-       return port;
-}
-
-void *xenbus_map(void)
-{
-       int fd;
-       void *addr;
-
-       fd = open(XENSTORED_PROC_KVA, O_RDWR);
-       if (fd == -1)
-               return NULL;
-
-       addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE,
-               MAP_SHARED, fd, 0);
-
-       if (addr == MAP_FAILED)
-               addr = NULL;
-
-       close(fd);
-
-       return addr;
-}
-
-void xenbus_notify_running(void)
-{
-}

diff --git a/tools/xenstore/xenstored_osdep.h b/tools/xenstore/xenstored_osdep.h
new file mode 100644 (file)
index 0000000..73c6461
--- /dev/null
+++ b/tools/xenstore/xenstored_osdep.h
@@ -0,0 +1,17 @@
+/*
+ * OS specific bits for xenstored
+ * Copyright (C) 2014 Citrix Systems R&D.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ */
+
+#if defined(__linux__)
+#define XENSTORED_KVA_DEV  "/proc/xen/xsd_kva"
+#define XENSTORED_PORT_DEV "/proc/xen/xsd_port"
+#elif defined(__NetBSD__)
+#define XENSTORED_KVA_DEV  "/dev/xsd_kva"
+#define XENSTORED_PORT_DEV "/kern/xen/xsd_port"
+#endif

diff --git a/tools/xenstore/xenstored_posix.c b/tools/xenstore/xenstored_posix.c
index 0c93e6d688ca23cbf054a34e2dbfa2978cb360f9..ecf4386794db8f7ec85da15d5da3f42102392c22 100644 (file)
--- a/tools/xenstore/xenstored_posix.c
+++ b/tools/xenstore/xenstored_posix.c
@@ -26,6 +26,7 @@
 
 #include "utils.h"
 #include "xenstored_core.h"
+#include "xenstored_osdep.h"
 
 void write_pidfile(const char *pidfile)
 {
@@ -99,3 +100,56 @@ void unmap_xenbus(void *interface)
 {
        munmap(interface, getpagesize());
 }
+
+#ifndef __sun__
+evtchn_port_t xenbus_evtchn(void)
+{
+       int fd;
+       int rc;
+       evtchn_port_t port;
+       char str[20];
+
+       fd = open(XENSTORED_PORT_DEV, O_RDONLY);
+       if (fd == -1)
+               return -1;
+
+       rc = read(fd, str, sizeof(str) - 1);
+       if (rc == -1)
+       {
+               int err = errno;
+               close(fd);
+               errno = err;
+               return -1;
+       }
+
+       str[rc] = '\0';
+       port = strtoul(str, NULL, 0);
+
+       close(fd);
+       return port;
+}
+
+void *xenbus_map(void)
+{
+       int fd;
+       void *addr;
+
+       fd = open(XENSTORED_KVA_DEV, O_RDWR);
+       if (fd == -1)
+               return NULL;
+
+       addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE,
+               MAP_SHARED, fd, 0);
+
+       if (addr == MAP_FAILED)
+               addr = NULL;
+
+       close(fd);
+
+       return addr;
+}
+
+void xenbus_notify_running(void)
+{
+}
+#endif /* !__sun__ */