libxc: Various xc_evtchn_* functions must return signed integer type.

Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 16 insertions, 12 deletions

diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index 65008115ea..a39157028d 100644
--- a/tools/libxc/xc_solaris.c
+++ b/tools/libxc/xc_solaris.c
@@ -165,7 +165,8 @@ int xc_evtchn_notify(int xce_handle, evtchn_port_t port)
     return ioctl(xce_handle, IOCTL_EVTCHN_NOTIFY, &notify);
 }
 
-evtchn_port_t xc_evtchn_bind_unbound_port(int xce_handle, int domid)
+evtchn_port_or_error_t
+xc_evtchn_bind_unbound_port(int xce_handle, int domid)
 {
     struct ioctl_evtchn_bind_unbound_port bind;
 
@@ -174,8 +175,9 @@ evtchn_port_t xc_evtchn_bind_unbound_port(int xce_handle, int domid)
     return ioctl(xce_handle, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind);
 }
 
-evtchn_port_t xc_evtchn_bind_interdomain(int xce_handle, int domid,
-    evtchn_port_t remote_port)
+evtchn_port_or_error_t
+xc_evtchn_bind_interdomain(int xce_handle, int domid,
+                           evtchn_port_t remote_port)
 {
     struct ioctl_evtchn_bind_interdomain bind;
 
@@ -185,22 +187,23 @@ evtchn_port_t xc_evtchn_bind_interdomain(int xce_handle, int domid,
     return ioctl(xce_handle, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind);
 }
 
-int xc_evtchn_unbind(int xce_handle, evtchn_port_t port)
+evtchn_port_or_error_t
+xc_evtchn_bind_virq(int xce_handle, unsigned int virq)
 {
-    struct ioctl_evtchn_unbind unbind;
+    struct ioctl_evtchn_bind_virq bind;
 
-    unbind.port = port;
+    bind.virq = virq;
 
-    return ioctl(xce_handle, IOCTL_EVTCHN_UNBIND, &unbind);
+    return ioctl(xce_handle, IOCTL_EVTCHN_BIND_VIRQ, &bind);
 }
 
-evtchn_port_t xc_evtchn_bind_virq(int xce_handle, unsigned int virq)
+int xc_evtchn_unbind(int xce_handle, evtchn_port_t port)
 {
-    struct ioctl_evtchn_bind_virq bind;
+    struct ioctl_evtchn_unbind unbind;
 
-    bind.virq = virq;
+    unbind.port = port;
 
-    return ioctl(xce_handle, IOCTL_EVTCHN_BIND_VIRQ, &bind);
+    return ioctl(xce_handle, IOCTL_EVTCHN_UNBIND, &unbind);
 }
 
 static int dorw(int fd, char *data, size_t size, int do_write)
@@ -228,7 +231,8 @@ static int dorw(int fd, char *data, size_t size, int do_write)
     return 0;
 }
 
-evtchn_port_t xc_evtchn_pending(int xce_handle)
+evtchn_port_or_error_t
+xc_evtchn_pending(int xce_handle)
 {
     evtchn_port_t port;