[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH 10/15] mini-os: eliminate netfront union member in struct file
Juergen Gross, le jeu. 06 janv. 2022 12:57:36 +0100, a ecrit: > Replace the netfront specific union member in struct file with the > common dev pointer. > > Signed-off-by: Juergen Gross <jgross@xxxxxxxx> Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> > --- > include/lib.h | 3 --- > lib/sys.c | 6 +++--- > netfront.c | 2 +- > 3 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/include/lib.h b/include/lib.h > index 5201ed7..f2a124e 100644 > --- 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 8c7ea3c..b35e433 100644 > --- 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 a566e34..7696451 100644 > --- 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 > -- > 2.26.2 > -- Samuel <c> tiens, je suis déçu <c> quand on clique sur le bouton random de http://xkcd.com/221/ on ne tombe pas (toujours) sur http://xkcd.com/4/ <c> bon, j'envoie un bug-report à l'auteur
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |