* [PATCH] linux-user/vm86: Fix compilation with Clang
@ 2024-10-11 16:18 Thomas Huth
2024-10-11 16:41 ` Dr. David Alan Gilbert
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Huth @ 2024-10-11 16:18 UTC (permalink / raw)
To: dave, qemu-devel, Laurent Vivier; +Cc: qemu-trivial
Since commit 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
a bunch of other "static inline" function are now unused, too. Clang
warns about such unused "static inline" functions in .c files, so the
build currently breaks when compiling with "--enable-werror". Remove
the unused functions to get it going again.
Fixes: 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
linux-user/vm86.c | 65 -----------------------------------------------
1 file changed, 65 deletions(-)
diff --git a/linux-user/vm86.c b/linux-user/vm86.c
index 31a2d707cf..5091d53fb8 100644
--- a/linux-user/vm86.c
+++ b/linux-user/vm86.c
@@ -47,30 +47,6 @@ static inline void vm_putw(CPUX86State *env, uint32_t segptr,
cpu_stw_data(env, segptr + (reg16 & 0xffff), val);
}
-static inline void vm_putl(CPUX86State *env, uint32_t segptr,
- unsigned int reg16, unsigned int val)
-{
- cpu_stl_data(env, segptr + (reg16 & 0xffff), val);
-}
-
-static inline unsigned int vm_getb(CPUX86State *env,
- uint32_t segptr, unsigned int reg16)
-{
- return cpu_ldub_data(env, segptr + (reg16 & 0xffff));
-}
-
-static inline unsigned int vm_getw(CPUX86State *env,
- uint32_t segptr, unsigned int reg16)
-{
- return cpu_lduw_data(env, segptr + (reg16 & 0xffff));
-}
-
-static inline unsigned int vm_getl(CPUX86State *env,
- uint32_t segptr, unsigned int reg16)
-{
- return cpu_ldl_data(env, segptr + (reg16 & 0xffff));
-}
-
void save_v86_state(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
@@ -131,19 +107,6 @@ static inline void return_to_32bit(CPUX86State *env, int retval)
env->regs[R_EAX] = retval;
}
-static inline int set_IF(CPUX86State *env)
-{
- CPUState *cs = env_cpu(env);
- TaskState *ts = get_task_state(cs);
-
- ts->v86flags |= VIF_MASK;
- if (ts->v86flags & VIP_MASK) {
- return_to_32bit(env, TARGET_VM86_STI);
- return 1;
- }
- return 0;
-}
-
static inline void clear_IF(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
@@ -162,34 +125,6 @@ static inline void clear_AC(CPUX86State *env)
env->eflags &= ~AC_MASK;
}
-static inline int set_vflags_long(unsigned long eflags, CPUX86State *env)
-{
- CPUState *cs = env_cpu(env);
- TaskState *ts = get_task_state(cs);
-
- set_flags(ts->v86flags, eflags, ts->v86mask);
- set_flags(env->eflags, eflags, SAFE_MASK);
- if (eflags & IF_MASK)
- return set_IF(env);
- else
- clear_IF(env);
- return 0;
-}
-
-static inline int set_vflags_short(unsigned short flags, CPUX86State *env)
-{
- CPUState *cs = env_cpu(env);
- TaskState *ts = get_task_state(cs);
-
- set_flags(ts->v86flags, flags, ts->v86mask & 0xffff);
- set_flags(env->eflags, flags, SAFE_MASK);
- if (flags & IF_MASK)
- return set_IF(env);
- else
- clear_IF(env);
- return 0;
-}
-
static inline unsigned int get_vflags(CPUX86State *env)
{
CPUState *cs = env_cpu(env);
--
2.46.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user/vm86: Fix compilation with Clang
2024-10-11 16:18 [PATCH] linux-user/vm86: Fix compilation with Clang Thomas Huth
@ 2024-10-11 16:41 ` Dr. David Alan Gilbert
2024-10-13 17:32 ` Richard Henderson
2024-10-13 20:51 ` Michael Tokarev
2 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2024-10-11 16:41 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Laurent Vivier, qemu-trivial
* Thomas Huth (thuth@redhat.com) wrote:
> Since commit 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> a bunch of other "static inline" function are now unused, too. Clang
> warns about such unused "static inline" functions in .c files, so the
> build currently breaks when compiling with "--enable-werror". Remove
> the unused functions to get it going again.
>
> Fixes: 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Sorry about that - thanks for the fix!
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
> ---
> linux-user/vm86.c | 65 -----------------------------------------------
> 1 file changed, 65 deletions(-)
>
> diff --git a/linux-user/vm86.c b/linux-user/vm86.c
> index 31a2d707cf..5091d53fb8 100644
> --- a/linux-user/vm86.c
> +++ b/linux-user/vm86.c
> @@ -47,30 +47,6 @@ static inline void vm_putw(CPUX86State *env, uint32_t segptr,
> cpu_stw_data(env, segptr + (reg16 & 0xffff), val);
> }
>
> -static inline void vm_putl(CPUX86State *env, uint32_t segptr,
> - unsigned int reg16, unsigned int val)
> -{
> - cpu_stl_data(env, segptr + (reg16 & 0xffff), val);
> -}
> -
> -static inline unsigned int vm_getb(CPUX86State *env,
> - uint32_t segptr, unsigned int reg16)
> -{
> - return cpu_ldub_data(env, segptr + (reg16 & 0xffff));
> -}
> -
> -static inline unsigned int vm_getw(CPUX86State *env,
> - uint32_t segptr, unsigned int reg16)
> -{
> - return cpu_lduw_data(env, segptr + (reg16 & 0xffff));
> -}
> -
> -static inline unsigned int vm_getl(CPUX86State *env,
> - uint32_t segptr, unsigned int reg16)
> -{
> - return cpu_ldl_data(env, segptr + (reg16 & 0xffff));
> -}
> -
> void save_v86_state(CPUX86State *env)
> {
> CPUState *cs = env_cpu(env);
> @@ -131,19 +107,6 @@ static inline void return_to_32bit(CPUX86State *env, int retval)
> env->regs[R_EAX] = retval;
> }
>
> -static inline int set_IF(CPUX86State *env)
> -{
> - CPUState *cs = env_cpu(env);
> - TaskState *ts = get_task_state(cs);
> -
> - ts->v86flags |= VIF_MASK;
> - if (ts->v86flags & VIP_MASK) {
> - return_to_32bit(env, TARGET_VM86_STI);
> - return 1;
> - }
> - return 0;
> -}
> -
> static inline void clear_IF(CPUX86State *env)
> {
> CPUState *cs = env_cpu(env);
> @@ -162,34 +125,6 @@ static inline void clear_AC(CPUX86State *env)
> env->eflags &= ~AC_MASK;
> }
>
> -static inline int set_vflags_long(unsigned long eflags, CPUX86State *env)
> -{
> - CPUState *cs = env_cpu(env);
> - TaskState *ts = get_task_state(cs);
> -
> - set_flags(ts->v86flags, eflags, ts->v86mask);
> - set_flags(env->eflags, eflags, SAFE_MASK);
> - if (eflags & IF_MASK)
> - return set_IF(env);
> - else
> - clear_IF(env);
> - return 0;
> -}
> -
> -static inline int set_vflags_short(unsigned short flags, CPUX86State *env)
> -{
> - CPUState *cs = env_cpu(env);
> - TaskState *ts = get_task_state(cs);
> -
> - set_flags(ts->v86flags, flags, ts->v86mask & 0xffff);
> - set_flags(env->eflags, flags, SAFE_MASK);
> - if (flags & IF_MASK)
> - return set_IF(env);
> - else
> - clear_IF(env);
> - return 0;
> -}
> -
> static inline unsigned int get_vflags(CPUX86State *env)
> {
> CPUState *cs = env_cpu(env);
> --
> 2.46.1
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user/vm86: Fix compilation with Clang
2024-10-11 16:18 [PATCH] linux-user/vm86: Fix compilation with Clang Thomas Huth
2024-10-11 16:41 ` Dr. David Alan Gilbert
@ 2024-10-13 17:32 ` Richard Henderson
2024-10-13 20:51 ` Michael Tokarev
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2024-10-13 17:32 UTC (permalink / raw)
To: Thomas Huth, dave, qemu-devel, Laurent Vivier; +Cc: qemu-trivial
On 10/11/24 09:18, Thomas Huth wrote:
> Since commit 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> a bunch of other "static inline" function are now unused, too. Clang
> warns about such unused "static inline" functions in .c files, so the
> build currently breaks when compiling with "--enable-werror". Remove
> the unused functions to get it going again.
>
> Fixes: 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
> linux-user/vm86.c | 65 -----------------------------------------------
> 1 file changed, 65 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
And queued.
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] linux-user/vm86: Fix compilation with Clang
2024-10-11 16:18 [PATCH] linux-user/vm86: Fix compilation with Clang Thomas Huth
2024-10-11 16:41 ` Dr. David Alan Gilbert
2024-10-13 17:32 ` Richard Henderson
@ 2024-10-13 20:51 ` Michael Tokarev
2 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2024-10-13 20:51 UTC (permalink / raw)
To: Thomas Huth, dave, qemu-devel, Laurent Vivier; +Cc: qemu-trivial
On 11.10.2024 19:18, Thomas Huth wrote:
> Since commit 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> a bunch of other "static inline" function are now unused, too. Clang
> warns about such unused "static inline" functions in .c files, so the
> build currently breaks when compiling with "--enable-werror". Remove
> the unused functions to get it going again.
>
> Fixes: 95b9c27c81 ("linux-user: Remove unused handle_vm86_fault")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Maybe I should send a pull-request with this one..
/mjt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-13 20:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-11 16:18 [PATCH] linux-user/vm86: Fix compilation with Clang Thomas Huth
2024-10-11 16:41 ` Dr. David Alan Gilbert
2024-10-13 17:32 ` Richard Henderson
2024-10-13 20:51 ` Michael Tokarev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).