[v1] bsd-user updates to run hello world

[PATCH for 6.2 24/49] bsd-user: Include more things in qemu.h

Warner Losh posted 49 patches 4 years, 4 months ago

Diff against v1 v1 v2 v3
Download mbox

Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>

There is a newer version of this series

[PATCH for 6.2 24/49] bsd-user: Include more things in qemu.h

Posted by Warner Losh 4 years, 4 months ago

From: Warner Losh <imp@FreeBSD.org>

Include more header files to match bsd-user fork.

Signed-off-by: Warner Losh <imp@bsdimp.com>
---
 bsd-user/qemu.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 6c4ec61d76..02e6e8327a 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -18,11 +18,15 @@
 #define QEMU_H
 
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu_ldst.h"
+#include "exec/exec-all.h"
+//#include "trace/trace-bsd_user.h"
 
 #undef DEBUG_REMAP
 #ifdef DEBUG_REMAP
+#include <stdio.h>
 #endif /* DEBUG_REMAP */
 
 #include "exec/user/abitypes.h"
@@ -36,8 +40,13 @@ enum BSDType {
 };
 extern enum BSDType bsd_type;
 
+#include "exec/user/thunk.h"
+#include "target_arch.h"
 #include "syscall_defs.h"
 #include "target_syscall.h"
+//#include "target_os_vmparam.h"
+//#include "target_os_signal.h"
+//#include "hostdep.h"
 #include "exec/gdbstub.h"
 
 /*
-- 
2.32.0

Re: [PATCH for 6.2 24/49] bsd-user: Include more things in qemu.h

Posted by Richard Henderson 4 years, 4 months ago

On 8/7/21 11:42 AM, Warner Losh wrote:
> From: Warner Losh <imp@FreeBSD.org>
> 
> Include more header files to match bsd-user fork.
> 
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>   bsd-user/qemu.h | 9 +++++++++
>   1 file changed, 9 insertions(+)
> 
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 6c4ec61d76..02e6e8327a 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -18,11 +18,15 @@
>   #define QEMU_H
>   
>   
> +#include "qemu/osdep.h"
>   #include "cpu.h"
>   #include "exec/cpu_ldst.h"
> +#include "exec/exec-all.h"
> +//#include "trace/trace-bsd_user.h"
>   
>   #undef DEBUG_REMAP
>   #ifdef DEBUG_REMAP
> +#include <stdio.h>
>   #endif /* DEBUG_REMAP */

osdep.h will have included stdio.h.

> +//#include "target_os_vmparam.h"
> +//#include "target_os_signal.h"
> +//#include "hostdep.h"

Delete these?


r~

Re: [PATCH for 6.2 24/49] bsd-user: Include more things in qemu.h

Posted by Warner Losh 4 years, 4 months ago

On Mon, Aug 9, 2021 at 2:31 PM Richard Henderson <
richard.henderson@linaro.org> wrote:

> On 8/7/21 11:42 AM, Warner Losh wrote:
> > From: Warner Losh <imp@FreeBSD.org>
> >
> > Include more header files to match bsd-user fork.
> >
> > Signed-off-by: Warner Losh <imp@bsdimp.com>
> > ---
> >   bsd-user/qemu.h | 9 +++++++++
> >   1 file changed, 9 insertions(+)
> >
> > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> > index 6c4ec61d76..02e6e8327a 100644
> > --- a/bsd-user/qemu.h
> > +++ b/bsd-user/qemu.h
> > @@ -18,11 +18,15 @@
> >   #define QEMU_H
> >
> >
> > +#include "qemu/osdep.h"
> >   #include "cpu.h"
> >   #include "exec/cpu_ldst.h"
> > +#include "exec/exec-all.h"
> > +//#include "trace/trace-bsd_user.h"
> >
> >   #undef DEBUG_REMAP
> >   #ifdef DEBUG_REMAP
> > +#include <stdio.h>
> >   #endif /* DEBUG_REMAP */
>
> osdep.h will have included stdio.h.
>
> > +//#include "target_os_vmparam.h"
> > +//#include "target_os_signal.h"
> > +//#include "hostdep.h"
>
> Delete these?
>

Done. I'll post in v2.  Thanks!

Warner