From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: [PATCH] ocaml: remove bogus /dev/xen/ev[en]tchn
Date: Wed, 23 Jun 2010 22:22:44 +0100
Message-ID: <4C227B24.7080102@goop.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>, Vincent Hanquez <Vincent.Hanquez@eu.citrix.com>, Ian Campbell <Ian.Campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

Oxenstored should not try to create the evtchn device, as it:

    * creates the wrong name (/dev/xen/eventchn rather than evtchn)
    * uses a hard-coded minor number, even though this dynamically
      depends on what other misc devices are in the kernel

Remove all this code and just rely on the system to create the device.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff -r a24dbfcbdf69 tools/ocaml/libs/eventchn/eventchn_stubs.c
--- a/tools/ocaml/libs/eventchn/eventchn_stubs.c	Tue Jun 22 07:19:38 2010 +0100
+++ b/tools/ocaml/libs/eventchn/eventchn_stubs.c	Wed Jun 23 22:17:29 2010 +0100
@@ -34,10 +34,7 @@
 #include <caml/callback.h>
 #include <caml/fail.h>
 
-#define EVENTCHN_PATH "/dev/xen/eventchn"
-
-static int eventchn_major = 10;
-static int eventchn_minor = 61;
+#define EVENTCHN_PATH "/dev/xen/evtchn"
 
 static int do_ioctl(int handle, int cmd, void *arg)
 {
@@ -56,15 +53,7 @@
 
 int eventchn_do_open(void)
 {
-	int fd;
-
-	fd = open(EVENTCHN_PATH, O_RDWR);
-	if (fd == -1 && errno == ENOENT) {
-		mkdir("/dev/xen", 0640);
-		mknod(EVENTCHN_PATH, S_IFCHR | 0640, makedev(eventchn_major, eventchn_minor));
-		fd = open(EVENTCHN_PATH, O_RDWR);
-	}
-	return fd;
+	return open(EVENTCHN_PATH, O_RDWR);
 }
 
 CAMLprim value stub_eventchn_init(value unit)