Skip to contentSkip to conversation

tools/libs/evtchn: Deduplicate xenevtchn_fd()

PATCH In review Andrew Cooper 2 participants 2 messages Jan 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/libs/evtchn: Deduplicate xenevtchn_fd()

struct xenevtchn_handle is common in private.h, meaning that xenevtchn_fd() has exactly one correct implementation.

Implement it in core.c, rather than identically for each OS. This matches all other libraries (call, gnttab, gntshr) which implement an fd getter.

---
CC: Anthony PERARD <[email protected]>
CC: Juergen Gross <[email protected]>

---
 tools/libs/evtchn/core.c    | 5 +++++
 tools/libs/evtchn/freebsd.c | 5 -----
 tools/libs/evtchn/linux.c   | 5 -----
 tools/libs/evtchn/minios.c  | 5 -----
 tools/libs/evtchn/netbsd.c  | 5 -----
 tools/libs/evtchn/solaris.c | 5 -----
 6 files changed, 5 insertions(+), 25 deletions(-)
tools/libs/evtchn/core.c +5 -0
index c402d9393b65..de925fc9630c 100644
@@ -120,6 +120,11 @@ int xenevtchn_close(xenevtchn_handle *xce)
     return rc;
 }
 
+int xenevtchn_fd(xenevtchn_handle *xce)
+{
+    return xce->fd;
+}
+
 int xenevtchn_restrict(xenevtchn_handle *xce, domid_t domid)
 {
     return osdep_evtchn_restrict(xce, domid);
tools/libs/evtchn/freebsd.c +0 -5
index 7427ab240860..c4d075350b5e 100644
@@ -63,11 +63,6 @@ int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid)
     return -1;
 }
 
-int xenevtchn_fd(xenevtchn_handle *xce)
-{
-    return xce->fd;
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int fd = xce->fd;
tools/libs/evtchn/linux.c +0 -5
index f27b6def39ef..e61b77ca618a 100644
@@ -66,11 +66,6 @@ int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid)
     return ioctl(xce->fd, IOCTL_EVTCHN_RESTRICT_DOMID, &restrict_domid);
 }
 
-int xenevtchn_fd(xenevtchn_handle *xce)
-{
-    return xce->fd;
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int fd = xce->fd;
tools/libs/evtchn/minios.c +0 -5
index e5dfdc5ef52e..8f84048b11f0 100644
@@ -112,11 +112,6 @@ void minios_evtchn_close_fd(int fd)
     files[fd].type = FTYPE_NONE;
 }
 
-int xenevtchn_fd(xenevtchn_handle *xce)
-{
-    return xce->fd;
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int ret;
tools/libs/evtchn/netbsd.c +0 -5
index 1cebc21ffce0..0b223c4beb26 100644
@@ -58,11 +58,6 @@ int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid)
     return -1;
 }
 
-int xenevtchn_fd(xenevtchn_handle *xce)
-{
-    return xce->fd;
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int fd = xce->fd;
tools/libs/evtchn/solaris.c +0 -5
index df9579df1778..7fef88a73e79 100644
@@ -57,11 +57,6 @@ int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid)
     return -1;
 }
 
-int xenevtchn_fd(xenevtchn_handle *xce)
-{
-    return xce->fd;
-}
-
 int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t port)
 {
     int fd = xce->fd;
Signature · 1 line
2.11.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Andrew Cooper

struct xenevtchn_handle is common in private.h, meaning that xenevtchn_fd() has exactly one correct implementation.

Implement it in core.c, rather than identically for each OS. This matches all other libraries (call, gnttab, gntshr) which implement an fd getter.

Oh, indeed.

Juergen