| Message ID | 20220111151215.22955-3-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:05 +0100, a ecrit: > The event channel specific union member in struct file is no longer > needed, so remove it. > > The gnttab file type and its associated handling can be removed, too, > as libxengnttab is now supplying a struct file_ops via a call of > alloc_file_type(). > > This removes all contents of CONFIG_LIBXENGNTTAB 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 - > gntmap.c | 2 +- > include/lib.h | 4 +--- > lib/sys.c | 5 ----- > 7 files changed, 2 insertions(+), 13 deletions(-) > > diff --git a/Config.mk b/Config.mk > index c244adc..eb84515 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_LIBXENGNTTAB > > CONFIG-$(lwip) += CONFIG_LWIP > > diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no > index 202c317..c429354 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_LIBXENGNTTAB = n > CONFIG_LWIP = n > CONFIG_BALLOON = n > CONFIG_USE_XEN_CONSOLE = n > diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes > index eb495a4..6c6096b 100644 > --- a/arch/x86/testbuild/all-yes > +++ b/arch/x86/testbuild/all-yes > @@ -16,5 +16,4 @@ CONFIG_XENBUS = y > CONFIG_BALLOON = y > CONFIG_USE_XEN_CONSOLE = y > # The following are special: they need support from outside > -CONFIG_LIBXENGNTTAB = n > CONFIG_LWIP = n > diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes > index bf25ace..88094fc 100644 > --- a/arch/x86/testbuild/newxen-yes > +++ b/arch/x86/testbuild/newxen-yes > @@ -17,5 +17,4 @@ 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_LIBXENGNTTAB = n > CONFIG_LWIP = n > diff --git a/gntmap.c b/gntmap.c > index 6fa1dac..3422ab2 100644 > --- a/gntmap.c > +++ b/gntmap.c > @@ -3,7 +3,7 @@ > * > * Diego Ongaro <diego.ongaro@citrix.com>, July 2008 > * > - * Files of type FTYPE_GNTMAP contain a gntmap, which is an array of > + * Files of libxengnttab contain a gntmap, which is an array of > * (host address, grant handle) pairs. Grant handles come from a hypervisor map > * operation and are needed for the corresponding unmap. > * > diff --git a/include/lib.h b/include/lib.h > index df972ef..283abb8 100644 > --- a/include/lib.h > +++ b/include/lib.h > @@ -168,8 +168,7 @@ void sanity_check(void); > #define FTYPE_TPMFRONT 10 > #define FTYPE_TPM_TIS 11 > #define FTYPE_XENBUS 12 > -#define FTYPE_GNTMAP 13 > -#define FTYPE_N 14 > +#define FTYPE_N 13 > #define FTYPE_SPARE 16 > > typedef int file_read_func(int fd, void *buf, size_t nbytes); > @@ -205,7 +204,6 @@ struct file { > union { > int fd; /* Any fd from an upper layer. */ > void *dev; > - struct gntmap gntmap; > }; > }; > > diff --git a/lib/sys.c b/lib/sys.c > index 8fa1fee..9540410 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_LIBXENGNTTAB > - case FTYPE_GNTMAP: > - minios_gnttab_close_fd(fd); > - break; > -#endif > #ifdef CONFIG_NETFRONT > case FTYPE_TAP: > shutdown_netfront(files[fd].dev); > -- > 2.26.2 >
On 11/01/2022 15:12, Juergen Gross wrote: > The event channel specific union member in struct file is no longer Too much copy&paste from the previous patch? The actual contents look fine. ~Andrew > needed, so remove it. > > The gnttab file type and its associated handling can be removed, too, > as libxengnttab is now supplying a struct file_ops via a call of > alloc_file_type(). > > This removes all contents of CONFIG_LIBXENGNTTAB guarded sections, so > this config option can be removed. > > Signed-off-by: Juergen Gross <jgross@suse.com>
On 11.01.22 21:12, Andrew Cooper wrote: > On 11/01/2022 15:12, Juergen Gross wrote: >> The event channel specific union member in struct file is no longer > > Too much copy&paste from the previous patch? Seems so, yes. :-) Juergen
diff --git a/Config.mk b/Config.mk index c244adc..eb84515 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_LIBXENGNTTAB CONFIG-$(lwip) += CONFIG_LWIP diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no index 202c317..c429354 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_LIBXENGNTTAB = n CONFIG_LWIP = n CONFIG_BALLOON = n CONFIG_USE_XEN_CONSOLE = n diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes index eb495a4..6c6096b 100644 --- a/arch/x86/testbuild/all-yes +++ b/arch/x86/testbuild/all-yes @@ -16,5 +16,4 @@ CONFIG_XENBUS = y CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y # The following are special: they need support from outside -CONFIG_LIBXENGNTTAB = n CONFIG_LWIP = n diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes index bf25ace..88094fc 100644 --- a/arch/x86/testbuild/newxen-yes +++ b/arch/x86/testbuild/newxen-yes @@ -17,5 +17,4 @@ 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_LIBXENGNTTAB = n CONFIG_LWIP = n diff --git a/gntmap.c b/gntmap.c index 6fa1dac..3422ab2 100644 --- a/gntmap.c +++ b/gntmap.c @@ -3,7 +3,7 @@ * * Diego Ongaro <diego.ongaro@citrix.com>, July 2008 * - * Files of type FTYPE_GNTMAP contain a gntmap, which is an array of + * Files of libxengnttab contain a gntmap, which is an array of * (host address, grant handle) pairs. Grant handles come from a hypervisor map * operation and are needed for the corresponding unmap. * diff --git a/include/lib.h b/include/lib.h index df972ef..283abb8 100644 --- a/include/lib.h +++ b/include/lib.h @@ -168,8 +168,7 @@ void sanity_check(void); #define FTYPE_TPMFRONT 10 #define FTYPE_TPM_TIS 11 #define FTYPE_XENBUS 12 -#define FTYPE_GNTMAP 13 -#define FTYPE_N 14 +#define FTYPE_N 13 #define FTYPE_SPARE 16 typedef int file_read_func(int fd, void *buf, size_t nbytes); @@ -205,7 +204,6 @@ struct file { union { int fd; /* Any fd from an upper layer. */ void *dev; - struct gntmap gntmap; }; }; diff --git a/lib/sys.c b/lib/sys.c index 8fa1fee..9540410 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_LIBXENGNTTAB - case FTYPE_GNTMAP: - minios_gnttab_close_fd(fd); - break; -#endif #ifdef CONFIG_NETFRONT case FTYPE_TAP: shutdown_netfront(files[fd].dev);
The event channel specific union member in struct file is no longer needed, so remove it. The gnttab file type and its associated handling can be removed, too, as libxengnttab is now supplying a struct file_ops via a call of alloc_file_type(). This removes all contents of CONFIG_LIBXENGNTTAB 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 - gntmap.c | 2 +- include/lib.h | 4 +--- lib/sys.c | 5 ----- 7 files changed, 2 insertions(+), 13 deletions(-)