WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 20 of 25] libxc: drop fd from xc_interface

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 20 of 25] libxc: drop fd from xc_interface
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Fri, 03 Dec 2010 09:57:24 +0000
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Delivery-date: Fri, 03 Dec 2010 02:25:50 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1291370224@xxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1291369007 0
# Node ID 379a7ce920c996d3805f88e8ba719e9a543fbc35
# Parent  2cca9651106419dc04b2dfebc51da4b3f9143482
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@xxxxxxxxxx>

diff -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_linux.c
--- a/tools/libxc/xc_linux.c    Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_linux.c    Fri Dec 03 09:36:47 2010 +0000
@@ -57,8 +57,6 @@ static xc_osdep_handle linux_privcmd_ope
         PERROR("Could not set file handle flags");
         goto error;
     }
-
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
 
     return (xc_osdep_handle)fd;
 
@@ -350,7 +348,6 @@ static xc_osdep_handle linux_evtchn_open
     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
     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 -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_minios.c
--- a/tools/libxc/xc_minios.c   Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_minios.c   Fri Dec 03 09:36:47 2010 +0000
@@ -56,7 +56,6 @@ static xc_osdep_handle minios_privcmd_op
     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_ope
         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_ope
     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 -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_netbsd.c
--- a/tools/libxc/xc_netbsd.c   Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_netbsd.c   Fri Dec 03 09:36:47 2010 +0000
@@ -50,8 +50,6 @@ static xc_osdep_handle netbsd_privcmd_op
         PERROR("Could not set file handle flags");
         goto error;
     }
-
-    xch->fd = fd; /* Remove after transition to full xc_osdep_ops. */
 
     return (xc_osinteface_handle)fd;
 
@@ -200,7 +198,6 @@ static xc_osdep_handle netbsd_evtchn_ope
     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 -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c  Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_private.c  Fri Dec 03 09:36:47 2010 +0000
@@ -59,7 +59,6 @@ static struct xc_interface_core *xc_inte
 
     xch->type = type;
     xch->flags = open_flags;
-    xch->fd = -1;
     xch->dombuild_logger_file = 0;
     xc_clear_last_error(xch);
 
diff -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_private.h
--- a/tools/libxc/xc_private.h  Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_private.h  Fri Dec 03 09:36:47 2010 +0000
@@ -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 -r 2cca96511064 -r 379a7ce920c9 tools/libxc/xc_solaris.c
--- a/tools/libxc/xc_solaris.c  Fri Dec 03 09:36:47 2010 +0000
+++ b/tools/libxc/xc_solaris.c  Fri Dec 03 09:36:47 2010 +0000
@@ -52,7 +52,6 @@ static xc_osdep_handle solaris_privcmd_o
         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_op
         return XC_OSDEP_OPEN_ERROR;
     }
 
-    xce->fd = fd; /* Remove after transition to full xc_osdep_ops. */
     return (xc_osdep_handle)fd;
 }
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>