Skip to contentSkip to conversation

ocaml: remove bogus /dev/xen/ev[en]tchn

PATCH New Jeremy Fitzhardinge 1 participant 1 message Jun 23, 2010

lore
Share & tools
lore

Jeremy Fitzhardinge

author
#0 lore raw

PATCH 1/1 ocaml: remove bogus /dev/xen/ev[en]tchn

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 <[email protected]>
tools/ocaml/libs/eventchn/eventchn_stubs.c +2 -13
diff -r a24dbfcbdf69 tools/ocaml/libs/eventchn/eventchn_stubs.c
@@ -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)