[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [MINIOS PATCH v3 01/12] remove event channel specific struct file definitions
Juergen Gross, le dim. 16 janv. 2022 09:33:17 +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. > > Add an extern declaration for event_queue as it is used by > libxenevtchn. > > Signed-off-by: Juergen Gross <jgross@xxxxxxxx> Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> > --- > V3: > - add extern declaration for event_queue (Andrew Cooper) > --- > Config.mk | 1 - > arch/x86/testbuild/all-no | 1 - > arch/x86/testbuild/all-yes | 1 - > arch/x86/testbuild/newxen-yes | 1 - > include/lib.h | 17 +++-------------- > lib/sys.c | 7 ------- > 6 files changed, 3 insertions(+), 25 deletions(-) > > diff --git a/Config.mk b/Config.mk > index 03023033..52eb26d8 100644 > --- a/Config.mk > +++ b/Config.mk > @@ -200,7 +200,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 46f974de..15c954ff 100644 > --- a/arch/x86/testbuild/all-no > +++ b/arch/x86/testbuild/all-no > @@ -14,7 +14,6 @@ CONFIG_KBDFRONT = n > CONFIG_CONSFRONT = n > CONFIG_XENBUS = n > CONFIG_LIBXS = 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 3ead12f1..9964d42f 100644 > --- a/arch/x86/testbuild/all-yes > +++ b/arch/x86/testbuild/all-yes > @@ -17,6 +17,5 @@ CONFIG_LIBXS = 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 5c0b3c80..c2519938 100644 > --- a/arch/x86/testbuild/newxen-yes > +++ b/arch/x86/testbuild/newxen-yes > @@ -18,6 +18,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 44696806..5f24be5d 100644 > --- a/include/lib.h > +++ b/include/lib.h > @@ -155,6 +155,8 @@ do { > \ > void sanity_check(void); > > #ifdef HAVE_LIBC > +extern struct wait_queue_head event_queue; > + > #define FTYPE_NONE 0 > #define FTYPE_CONSOLE 1 > #define FTYPE_FILE 2 > @@ -169,19 +171,9 @@ 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 > > -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 */ > @@ -189,9 +181,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 e0ac5099..34f0193d 100644 > --- a/lib/sys.c > +++ b/lib/sys.c > @@ -533,11 +533,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); > @@ -770,7 +765,6 @@ static const char *const file_types[] = { > [FTYPE_NONE] = "none", > [FTYPE_CONSOLE] = "console", > [FTYPE_XENBUS] = "xenbus", > - [FTYPE_EVTCHN] = "evtchn", > [FTYPE_SOCKET] = "socket", > [FTYPE_TAP] = "net", > [FTYPE_BLK] = "blk", > @@ -970,7 +964,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 > -- Samuel tohi.cybercable.fr (212.198.0.3) si une personne se reconnait derriere cette adresse que ce soit un pirate ou une victime qu'il se manifeste, cette personne pourrait bien etre un petit malin -+- Fred in NPC : Mamaaaaan, y a le routeur qui veut me hacker -+-
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |