| Message ID | 20220111151215.22955-2-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mini-os: remove device specific struct file members | expand |
Juergen Gross, le mar. 11 janv. 2022 16:12:04 +0100, a ecrit: > The event channel specific union member in struct file is no longer > needed, so remove it together with the associated structure > definitions. > > The event channel file type and its associated handling can be removed, > too, as libxenevtchn is now supplying a struct file_ops via a call of > alloc_file_type(). > > This removes all contents of CONFIG_LIBXENEVTCHN guarded sections, so > this config option can be removed. > > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > Config.mk | 1 - > arch/x86/testbuild/all-no | 1 - > arch/x86/testbuild/all-yes | 1 - > arch/x86/testbuild/newxen-yes | 1 - > include/lib.h | 15 +-------------- > lib/sys.c | 7 ------- > 6 files changed, 1 insertion(+), 25 deletions(-) > > diff --git a/Config.mk b/Config.mk > index 1e08388..c244adc 100644 > --- a/Config.mk > +++ b/Config.mk > @@ -197,7 +197,6 @@ CONFIG-n += CONFIG_PARAVIRT > endif > # Support legacy CONFIG_XC value > CONFIG_XC ?= $(libc) > -CONFIG-$(CONFIG_XC) += CONFIG_LIBXENEVTCHN > CONFIG-$(CONFIG_XC) += CONFIG_LIBXENGNTTAB > > CONFIG-$(lwip) += CONFIG_LWIP > diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no > index d6fc260..202c317 100644 > --- a/arch/x86/testbuild/all-no > +++ b/arch/x86/testbuild/all-no > @@ -13,7 +13,6 @@ CONFIG_FBFRONT = n > CONFIG_KBDFRONT = n > CONFIG_CONSFRONT = n > CONFIG_XENBUS = n > -CONFIG_LIBXENEVTCHN = n > CONFIG_LIBXENGNTTAB = n > CONFIG_LWIP = n > CONFIG_BALLOON = n > diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes > index 98bbfeb..eb495a4 100644 > --- a/arch/x86/testbuild/all-yes > +++ b/arch/x86/testbuild/all-yes > @@ -16,6 +16,5 @@ CONFIG_XENBUS = y > CONFIG_BALLOON = y > CONFIG_USE_XEN_CONSOLE = y > # The following are special: they need support from outside > -CONFIG_LIBXENEVTCHN = n > CONFIG_LIBXENGNTTAB = n > CONFIG_LWIP = n > diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes > index 0603200..bf25ace 100644 > --- a/arch/x86/testbuild/newxen-yes > +++ b/arch/x86/testbuild/newxen-yes > @@ -17,6 +17,5 @@ CONFIG_BALLOON = y > CONFIG_USE_XEN_CONSOLE = y > XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__ > # The following are special: they need support from outside > -CONFIG_LIBXENEVTCHN = n > CONFIG_LIBXENGNTTAB = n > CONFIG_LWIP = n > diff --git a/include/lib.h b/include/lib.h > index 4892320..df972ef 100644 > --- a/include/lib.h > +++ b/include/lib.h > @@ -169,8 +169,7 @@ void sanity_check(void); > #define FTYPE_TPM_TIS 11 > #define FTYPE_XENBUS 12 > #define FTYPE_GNTMAP 13 > -#define FTYPE_EVTCHN 14 > -#define FTYPE_N 15 > +#define FTYPE_N 14 > #define FTYPE_SPARE 16 > > typedef int file_read_func(int fd, void *buf, size_t nbytes); > @@ -199,15 +198,6 @@ off_t lseek_default(int fd, off_t offset, int whence); > bool select_yes(int fd); > bool select_read_flag(int fd); > > -LIST_HEAD(evtchn_port_list, evtchn_port_info); > - > -struct evtchn_port_info { > - LIST_ENTRY(evtchn_port_info) list; > - evtchn_port_t port; > - unsigned long pending; > - int bound; > -}; > - > struct file { > unsigned int type; > bool read; /* maybe available for read */ > @@ -215,9 +205,6 @@ struct file { > union { > int fd; /* Any fd from an upper layer. */ > void *dev; > - struct { > - struct evtchn_port_list ports; > - } evtchn; > struct gntmap gntmap; > }; > }; > diff --git a/lib/sys.c b/lib/sys.c > index 52876e0..8fa1fee 100644 > --- a/lib/sys.c > +++ b/lib/sys.c > @@ -505,11 +505,6 @@ int close(int fd) > res = lwip_close(files[fd].fd); > break; > #endif > -#ifdef CONFIG_LIBXENEVTCHN > - case FTYPE_EVTCHN: > - minios_evtchn_close_fd(fd); > - break; > -#endif > #ifdef CONFIG_LIBXENGNTTAB > case FTYPE_GNTMAP: > minios_gnttab_close_fd(fd); > @@ -723,7 +718,6 @@ static const char *file_types[] = { > [FTYPE_NONE] = "none", > [FTYPE_CONSOLE] = "console", > [FTYPE_XENBUS] = "xenbus", > - [FTYPE_EVTCHN] = "evtchn", > [FTYPE_SOCKET] = "socket", > [FTYPE_TAP] = "net", > [FTYPE_BLK] = "blk", > @@ -915,7 +909,6 @@ static int select_poll(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exce > FD_CLR(i, exceptfds); > break; > #endif > - case FTYPE_EVTCHN: > case FTYPE_TAP: > case FTYPE_BLK: > case FTYPE_KBD: > -- > 2.26.2 >
diff --git a/Config.mk b/Config.mk index 1e08388..c244adc 100644 --- a/Config.mk +++ b/Config.mk @@ -197,7 +197,6 @@ CONFIG-n += CONFIG_PARAVIRT endif # Support legacy CONFIG_XC value CONFIG_XC ?= $(libc) -CONFIG-$(CONFIG_XC) += CONFIG_LIBXENEVTCHN CONFIG-$(CONFIG_XC) += CONFIG_LIBXENGNTTAB CONFIG-$(lwip) += CONFIG_LWIP diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no index d6fc260..202c317 100644 --- a/arch/x86/testbuild/all-no +++ b/arch/x86/testbuild/all-no @@ -13,7 +13,6 @@ CONFIG_FBFRONT = n CONFIG_KBDFRONT = n CONFIG_CONSFRONT = n CONFIG_XENBUS = n -CONFIG_LIBXENEVTCHN = n CONFIG_LIBXENGNTTAB = n CONFIG_LWIP = n CONFIG_BALLOON = n diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes index 98bbfeb..eb495a4 100644 --- a/arch/x86/testbuild/all-yes +++ b/arch/x86/testbuild/all-yes @@ -16,6 +16,5 @@ CONFIG_XENBUS = y CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y # The following are special: they need support from outside -CONFIG_LIBXENEVTCHN = n CONFIG_LIBXENGNTTAB = n CONFIG_LWIP = n diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes index 0603200..bf25ace 100644 --- a/arch/x86/testbuild/newxen-yes +++ b/arch/x86/testbuild/newxen-yes @@ -17,6 +17,5 @@ CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__ # The following are special: they need support from outside -CONFIG_LIBXENEVTCHN = n CONFIG_LIBXENGNTTAB = n CONFIG_LWIP = n diff --git a/include/lib.h b/include/lib.h index 4892320..df972ef 100644 --- a/include/lib.h +++ b/include/lib.h @@ -169,8 +169,7 @@ void sanity_check(void); #define FTYPE_TPM_TIS 11 #define FTYPE_XENBUS 12 #define FTYPE_GNTMAP 13 -#define FTYPE_EVTCHN 14 -#define FTYPE_N 15 +#define FTYPE_N 14 #define FTYPE_SPARE 16 typedef int file_read_func(int fd, void *buf, size_t nbytes); @@ -199,15 +198,6 @@ off_t lseek_default(int fd, off_t offset, int whence); bool select_yes(int fd); bool select_read_flag(int fd); -LIST_HEAD(evtchn_port_list, evtchn_port_info); - -struct evtchn_port_info { - LIST_ENTRY(evtchn_port_info) list; - evtchn_port_t port; - unsigned long pending; - int bound; -}; - struct file { unsigned int type; bool read; /* maybe available for read */ @@ -215,9 +205,6 @@ struct file { union { int fd; /* Any fd from an upper layer. */ void *dev; - struct { - struct evtchn_port_list ports; - } evtchn; struct gntmap gntmap; }; }; diff --git a/lib/sys.c b/lib/sys.c index 52876e0..8fa1fee 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -505,11 +505,6 @@ int close(int fd) res = lwip_close(files[fd].fd); break; #endif -#ifdef CONFIG_LIBXENEVTCHN - case FTYPE_EVTCHN: - minios_evtchn_close_fd(fd); - break; -#endif #ifdef CONFIG_LIBXENGNTTAB case FTYPE_GNTMAP: minios_gnttab_close_fd(fd); @@ -723,7 +718,6 @@ static const char *file_types[] = { [FTYPE_NONE] = "none", [FTYPE_CONSOLE] = "console", [FTYPE_XENBUS] = "xenbus", - [FTYPE_EVTCHN] = "evtchn", [FTYPE_SOCKET] = "socket", [FTYPE_TAP] = "net", [FTYPE_BLK] = "blk", @@ -915,7 +909,6 @@ static int select_poll(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exce FD_CLR(i, exceptfds); break; #endif - case FTYPE_EVTCHN: case FTYPE_TAP: case FTYPE_BLK: case FTYPE_KBD:
The event channel specific union member in struct file is no longer needed, so remove it together with the associated structure definitions. The event channel file type and its associated handling can be removed, too, as libxenevtchn is now supplying a struct file_ops via a call of alloc_file_type(). This removes all contents of CONFIG_LIBXENEVTCHN guarded sections, so this config option can be removed. Signed-off-by: Juergen Gross <jgross@suse.com> --- Config.mk | 1 - arch/x86/testbuild/all-no | 1 - arch/x86/testbuild/all-yes | 1 - arch/x86/testbuild/newxen-yes | 1 - include/lib.h | 15 +-------------- lib/sys.c | 7 ------- 6 files changed, 1 insertion(+), 25 deletions(-)