libxc: drop fd from xc_interface

Transition to xc_osdep_handle is now complete and nothing uses
(or should be using) it.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/libxc/xc_linux.c b/tools/libxc/xc_linux.c
index a1ed5f450c5156ebe938ba711447193b630cf9ab..eafa7e1d56d5dc176173e5c07459538502fcd2cb 100644 (file)
--- a/tools/libxc/xc_linux.c
+++ b/tools/libxc/xc_linux.c
@@ -58,8 +58,6 @@ static xc_osdep_handle linux_privcmd_open(xc_interface *xch)
         goto error;
     }
 
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
-
     return (xc_osdep_handle)fd;
 
  error:
@@ -350,7 +348,6 @@ static xc_osdep_handle linux_evtchn_open(xc_evtchn *xce)
     if ( fd == -1 )
         return XC_OSDEP_OPEN_ERROR;
 
-    xce->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 
@@ -498,7 +495,6 @@ static xc_osdep_handle linux_gnttab_open(xc_gnttab *xcg)
     if ( fd == -1 )
         return XC_OSDEP_OPEN_ERROR;
 
-    xcg->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 

diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c
index 990f7142ef156950460361644809c99fed1f360c..ee0468782a5608919282fb2d450e93e5a82e2792 100644 (file)
--- a/tools/libxc/xc_minios.c
+++ b/tools/libxc/xc_minios.c
@@ -56,7 +56,6 @@ static xc_osdep_handle minios_privcmd_open(xc_interface *xch)
     if ( fd == -1)
         return XC_OSDEP_OPEN_ERROR;
 
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 
@@ -207,7 +206,6 @@ static xc_osdep_handle minios_evtchn_open(xc_evtchn *xce)
         files[fd].evtchn.ports[i].bound = 0;
     }
     printf("evtchn_open() -> %d\n", fd);
-    xce->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 
@@ -431,7 +429,6 @@ static xc_osdep_handle minios_gnttab_open(xc_gnttab *xcg)
     if ( fd == -1 )
         return XC_OSDEP_OPEN_ERROR;
     gntmap_init(&files[fd].gntmap);
-    xcg->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 

diff --git a/tools/libxc/xc_netbsd.c b/tools/libxc/xc_netbsd.c
index d3ec9c54e59163cfeb27f0b115bf07f7e9aa12db..e84b88b6ee7a564b27b77cb40357a53afe7c6873 100644 (file)
--- a/tools/libxc/xc_netbsd.c
+++ b/tools/libxc/xc_netbsd.c
@@ -51,8 +51,6 @@ static xc_osdep_handle netbsd_privcmd_open(xc_interface *xch)
         goto error;
     }
 
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
-
     return (xc_osinteface_handle)fd;
 
  error:
@@ -200,7 +198,6 @@ static xc_osdep_handle netbsd_evtchn_open(xc_evtchn *xce)
     if ( fd == -1 )
         return XC_OSDEP_OPEN_ERROR;
 
-    xce->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index 69b674dabff9069aae3cc8bdd9806df664b41456..a41fa32f4c759a8d1ccc64426c88abb8389eb06a 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -59,7 +59,6 @@ static struct xc_interface_core *xc_interface_open_common(xentoollog_logger *log
 
     xch->type = type;
     xch->flags = open_flags;
-    xch->fd = -1;
     xch->dombuild_logger_file = 0;
     xc_clear_last_error(xch);
 

diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
index ccd1605288596e146cf4a3b6887e887e192d1173..4d06b02d39b65b9c97ca06ef63297a4a4cca52bf 100644 (file)
--- a/tools/libxc/xc_private.h
+++ b/tools/libxc/xc_private.h
@@ -68,7 +68,6 @@
 
 struct xc_interface_core {
     enum xc_osdep_type type;
-    int fd;
     int flags;
     xentoollog_logger *error_handler,   *error_handler_tofree;
     xentoollog_logger *dombuild_logger, *dombuild_logger_tofree;

diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index 71bbbe62a2a12155d71137681c63ce30a52734dd..cb366d72542cdab3269256948bf42332c6a35a74 100644 (file)
--- a/tools/libxc/xc_solaris.c
+++ b/tools/libxc/xc_solaris.c
@@ -52,7 +52,6 @@ static xc_osdep_handle solaris_privcmd_open(xc_interface *xch)
         goto error;
     }
 
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 
  error:
@@ -192,7 +191,6 @@ static xc_osdep_handle solaris_evtchn_open(xc_evtchn *xce)
         return XC_OSDEP_OPEN_ERROR;
     }
 
-    xce->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }