Eliminate netfront union member in struct file

Replace the netfront specific union member in struct file with the
common dev pointer.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/include/lib.h b/include/lib.h
index 5201ed7c637a57c3f97c9626e2778266c611a16a..f2a124e2bdb009d5f59257e75bff5dee4d978f36 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -193,9 +193,6 @@ struct file {
            struct evtchn_port_list ports;
        } evtchn;
        struct gntmap gntmap;
-       struct {
-           struct netfront_dev *dev;
-       } tap;
 #ifdef CONFIG_TPMFRONT
        struct {
           struct tpmfront_dev *dev;

diff --git a/lib/sys.c b/lib/sys.c
index 8c7ea3cecaa51e4060c7b1eea96bc0e594efa477..b35e43340a491d179e3fe2bd0fe45b84e0efc4a0 100644 (file)
--- a/lib/sys.c
+++ b/lib/sys.c
@@ -263,7 +263,7 @@ int read(int fd, void *buf, size_t nbytes)
 #ifdef CONFIG_NETFRONT
        case FTYPE_TAP: {
            ssize_t ret;
-           ret = netfront_receive(files[fd].tap.dev, buf, nbytes);
+           ret = netfront_receive(files[fd].dev, buf, nbytes);
            if (ret <= 0) {
                errno = EAGAIN;
                return -1;
@@ -339,7 +339,7 @@ int write(int fd, const void *buf, size_t nbytes)
 #endif
 #ifdef CONFIG_NETFRONT
        case FTYPE_TAP:
-           netfront_xmit(files[fd].tap.dev, (void*) buf, nbytes);
+           netfront_xmit(files[fd].dev, (void*) buf, nbytes);
            return nbytes;
 #endif
 #ifdef CONFIG_BLKFRONT
@@ -450,7 +450,7 @@ int close(int fd)
 #endif
 #ifdef CONFIG_NETFRONT
        case FTYPE_TAP:
-           shutdown_netfront(files[fd].tap.dev);
+           shutdown_netfront(files[fd].dev);
            files[fd].type = FTYPE_NONE;
            return 0;
 #endif

diff --git a/netfront.c b/netfront.c
index a566e34a33d3d34ac028fb1108398e719a8c2602..769645147d4f69fdd21e90d785cd4c5fa7a30b1f 100644 (file)
--- a/netfront.c
+++ b/netfront.c
@@ -576,7 +576,7 @@ int netfront_tap_open(char *nodename) {
     }
     dev->fd = alloc_fd(FTYPE_TAP);
     printk("tap_open(%s) -> %d\n", nodename, dev->fd);
-    files[dev->fd].tap.dev = dev;
+    files[dev->fd].dev = dev;
     return dev->fd;
 }
 #endif