1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
$NetBSD: patch-bq,v 1.1.1.1 2006/07/02 16:49:31 bouyer Exp $
--- xenstat/libxenstat/src/xen-interface.c.orig 2006-04-13 19:48:39.000000000 +0200
+++ xenstat/libxenstat/src/xen-interface.c 2006-07-01 23:17:50.000000000 +0200
@@ -23,7 +23,13 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <errno.h>
+#ifdef __NetBSD__
+#include <xen/NetBSD/xenio.h>
+#else
+#error linux
#include <xen/linux/privcmd.h>
+#endif
struct xi_handle {
int fd;
@@ -39,9 +45,9 @@
if (handle == NULL)
return NULL;
- handle->fd = open("/proc/xen/privcmd", O_RDWR);
+ handle->fd = open("/kern/xen/privcmd", O_RDWR);
if (handle->fd < 0) {
- perror("Couldn't open /proc/xen/privcmd");
+ perror("Couldn't open /kern/xen/privcmd");
free(handle);
return NULL;
}
@@ -78,7 +84,10 @@
privcmd.arg[0] = (unsigned long)XENVER_version;
privcmd.arg[1] = 0;
- *vnum = ioctl(handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd);
+ if (ioctl(handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd) == 0)
+ *vnum = 0;
+ else
+ *vnum = -errno;
if (*vnum < 0) {
perror("Hypercall failed");
ret = -1;
@@ -88,7 +97,8 @@
privcmd.arg[0] = (unsigned long)XENVER_extraversion;
privcmd.arg[1] = (unsigned long)ver;
- if (ioctl(handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd) < 0) {
+ if (ioctl(handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd) < 0 &&
+ errno >= 0) {
perror("Hypercall failed");
ret = -1;
}
@@ -123,7 +133,8 @@
return -1;
}
- if (ioctl( handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd) < 0) {
+ if (ioctl( handle->fd, IOCTL_PRIVCMD_HYPERCALL, &privcmd) < 0 &&
+ errno >= 0) {
perror("Hypercall failed");
ret = -1;
}
|
