Xen project Mailing List

Re: [Minios-devel] [UNIKRAFT PATCH v3 1/4] include/xen-x86: Remove os.h on x86

To: radunicolau102@xxxxxxxxx, minios-devel@xxxxxxxxxxxxx

From: Costin Lupu <costin.lupu@xxxxxxxxx>

Date: Mon, 3 Dec 2018 14:43:41 +0200

Delivery-date: Mon, 03 Dec 2018 12:43:49 +0000

Ironport-phdr: 9a23:z15ECR+6Bou4Df9uRHKM819IXTAuvvDOBiVQ1KB31+ocTK2v8tzYMVDF4r011RmVBdWds6oMotGVmpioYXYH75eFvSJKW713fDhBt/8rmRc9CtWOE0zxIa2iRSU7GMNfSA0tpCnjYgBaF8nkelLdvGC54yIMFRXjLwp1Ifn+FpLPg8it2O2+557ebx9UiDahfLh/MAi4oQLNu8cMnIBsMLwxyhzHontJf+RZ22ZlLk+Nkhj/+8m94odt/zxftPw9+cFAV776f7kjQrxDEDsmKWE169b1uhTFUACC+2ETUmQSkhpPHgjF8BT3VYr/vyfmquZw3jSRMMvrRr42RDui9b9mRgL2hicJNzA382/ZhcJ/g61ZvB2vqAdyw5LWbYyPKPZyYq3QcNEcSGFcXshRTStBAoakYoYRCOoBJvpYr4j7p1ATqxW+GBGsBP7ywTJPmnD22rY60/ggEQHAxgAgG88OsGzJrNjuKKgSSvq5zLHVzTrYdf9WwzD95ZHOfxs8ov+MRap9fdfexEUyDQ/IjVWdpZb7Mz+L1OkBqWaW4/J9We+glmIrsQJ8rzi1yssyhITEiJgZxk3L+Clnxos+OMe2R1RhYdG+FZtdrySaN4xrTcw8W2xooyM6yqEeuZ68YSgK1Iwrxx7BZPyDdIiF+gzjVOOLLjd5gHJpYq6whw2o/Ui41+3zTdO40ExNriZdk9nMsG4C1wDL58SaRfZx412t1DWP2gzJ9O1IP0I5mbDVJpI5x74/jJsTsUDNHi/sn0X2ibebeVkj+uiz9+TnY7PmqoWYN49pkgH+L78jldCkAegiKggOQnOU9f6m1L3k5UH5WqlFjuUqkqnFt5DXPd4bqbSkDA9I1IYj6gqwDzCi0NsCgHkLMU5JdAycgojmPlHBOvH4DfOlj1uwlzdrwujMPqf9DZXVMnjDjLDhcK54605dzgozzNdf54lNBr4cPv3zRFH+tNjDAx89Mgy02PrnCM5n2oIRR22PBLWVMKTIsV+HtaoTJLyWbYMIvjf2LPws+qe211c2nFYcee+i2p5TIHW5GPVhOACVbGThhv8FEHwWpUwuQeqsj0eNAhBJYHPndKUn+jA9QKa7FZqLEouqm6CA2mG/A4VLTmtdTEiRGzHycNPXCL83dCuOL5o5wXQ/Xr+7Rtp52A==

List-id: Mini-os development list <minios-devel.lists.xenproject.org>

Reviewed-by: Costin Lupu <costin.lupu@xxxxxxxxx> On 11/24/18 1:23 PM, radunicolau102@xxxxxxxxx wrote: > From: Radu Nicolau <radunicolau102@xxxxxxxxx> > > Remove os.h from the project as it was unused. > mm_pv.h included os.h but did not use anything from > it. The rest of the changes have been made in sources > which need the extern definition for the shared info > page. > > Signed-off-by: Radu Nicolau <radunicolau102@xxxxxxxxx> > --- > plat/xen/gnttab.c | 1 + > plat/xen/include/xen-x86/mm_pv.h | 1 - > plat/xen/include/xen-x86/os.h | 90 > ---------------------------------------- > plat/xen/include/xen-x86/setup.h | 1 - > plat/xen/lcpu.c | 1 - > plat/xen/x86/mm.c | 1 + > plat/xen/xenbus/xs_comms.c | 1 + > 7 files changed, 3 insertions(+), 93 deletions(-) > delete mode 100644 plat/xen/include/xen-x86/os.h > > diff --git a/plat/xen/gnttab.c b/plat/xen/gnttab.c > index ddfff99..edc3341 100644 > --- a/plat/xen/gnttab.c > +++ b/plat/xen/gnttab.c > @@ -27,6 +27,7 @@ > #include <common/gnttab.h> > #include <xen-x86/mm.h> > > +#include <xen-x86/hypercall.h> > > /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */ > #define NR_GRANT_FRAMES 4 > diff --git a/plat/xen/include/xen-x86/mm_pv.h > b/plat/xen/include/xen-x86/mm_pv.h > index 21f9169..f78e62f 100644 > --- a/plat/xen/include/xen-x86/mm_pv.h > +++ b/plat/xen/include/xen-x86/mm_pv.h > @@ -24,7 +24,6 @@ > #ifndef _MM_PV_H > #define _MM_PV_H > > -#include <xen-x86/os.h> > #include <xen-x86/setup.h> > > #ifdef __x86_64__ > diff --git a/plat/xen/include/xen-x86/os.h b/plat/xen/include/xen-x86/os.h > deleted file mode 100644 > index 308d91a..0000000 > --- a/plat/xen/include/xen-x86/os.h > +++ /dev/null > @@ -1,90 +0,0 @@ > -/* SPDX-License-Identifier: BSD-2-Clause */ > -/* > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 2. Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - */ > -/* Taken from Mini-OS */ > -/****************************************************************************** > - * os.h > - * > - * random collection of macros and definition > - */ > - > -#ifndef _OS_H_ > -#define _OS_H_ > - > -#include <xen-x86/smp.h> > - > -#include <stdint.h> > -#include <stddef.h> > -#include <limits.h> > -#include <uk/arch/types.h> > -#include <uk/arch/limits.h> > -#include <uk/arch/time.h> > -#include <xen/xen.h> > - > -#ifndef __ASSEMBLY__ > - > -typedef __s64 quad_t; > -typedef __u64 u_quad_t; > - > -typedef __sptr intptr_t; > -typedef __uptr uintptr_t; > -typedef __sptr ptrdiff_t; > - > -typedef unsigned char u_char; > -typedef unsigned int u_int; > -typedef unsigned long u_long; > - > -#include <xen-x86/hypercall.h> > - > -#include <xen/event_channel.h> > -#include <xen/xsm/flask_op.h> > -#endif > - > -#include <x86/cpu_defs.h> > - > - > -#define LOCK_PREFIX "" > -#define ADDR (*(volatile long *)addr) > - > -/* Everything below this point is not included by assembler (.S) files. */ > -#ifndef __ASSEMBLY__ > - > -extern shared_info_t *HYPERVISOR_shared_info; > - > -#include <xen-x86/irq.h> > - > - > -/* > - * Make sure gcc doesn't try to be clever and move things around > - * on us. We need to use _exactly_ the address the user gave us, > - * not some alias that contains the same information. > - */ > -typedef struct { > - volatile int counter; > -} atomic_t; > - > - > -void block_domain(__snsec until); > - > -#endif /* not assembly */ > -#endif /* _OS_H_ */ > diff --git a/plat/xen/include/xen-x86/setup.h > b/plat/xen/include/xen-x86/setup.h > index 6eaa4f1..7a57190 100644 > --- a/plat/xen/include/xen-x86/setup.h > +++ b/plat/xen/include/xen-x86/setup.h > @@ -46,7 +46,6 @@ extern unsigned int _libxenplat_mrd_num; > extern struct ukplat_memregion_desc _libxenplat_mrd[]; > extern char _libxenplat_bootstack[]; > > -/* Note: HYPERVISOR_shared_info is defined in os.h */ > extern start_info_t *HYPERVISOR_start_info; > > #endif /* __SETUP_H__ */ > diff --git a/plat/xen/lcpu.c b/plat/xen/lcpu.c > index f0650da..d7158df 100644 > --- a/plat/xen/lcpu.c > +++ b/plat/xen/lcpu.c > @@ -34,7 +34,6 @@ > > #include <stdint.h> > #if defined(__X86_32__) || defined(__x86_64__) > -#include <xen-x86/os.h> > #include <xen-x86/irq.h> > #elif (defined __ARM_32__) || (defined __ARM_64__) > #include <xen-arm/os.h> > diff --git a/plat/xen/x86/mm.c b/plat/xen/x86/mm.c > index b7b080e..b89384f 100644 > --- a/plat/xen/x86/mm.c > +++ b/plat/xen/x86/mm.c > @@ -39,6 +39,7 @@ > #include <errno.h> > #include <uk/alloc.h> > #include <uk/plat/config.h> > +#include <common/hypervisor.h> > #include <xen-x86/mm.h> > #include <xen/memory.h> > #include <uk/print.h> > diff --git a/plat/xen/xenbus/xs_comms.c b/plat/xen/xenbus/xs_comms.c > index 274e44b..0589d48 100644 > --- a/plat/xen/xenbus/xs_comms.c > +++ b/plat/xen/xenbus/xs_comms.c > @@ -46,6 +46,7 @@ > #include <uk/wait.h> > #include <uk/arch/spinlock.h> > #include <common/events.h> > +#include <common/hypervisor.h> > #include <xen-x86/mm.h> > #include <xen-x86/setup.h> > #include <xenbus/client.h> > _______________________________________________ Minios-devel mailing list Minios-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/minios-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.