[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] target/i386: fix shadowed variable pasto
From: |
Markus Armbruster |
Subject: |
[PULL 5/5] target/i386: fix shadowed variable pasto |
Date: |
Thu, 12 Oct 2023 16:57:21 +0200 |
From: Paolo Bonzini <pbonzini@redhat.com>
Commit a908985971a ("target/i386/seg_helper: introduce tss_set_busy",
2023-09-26) failed to use the tss_selector argument of the new function,
which was therefore unused.
This shows up as a #GP fault when booting old versions of 32-bit
Linux.
Fixes: a908985971a ("target/i386/seg_helper: introduce tss_set_busy",
2023-09-26)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20231011135350.438492-1-pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
target/i386/tcg/seg_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c
index 2b92aee207..eb29a1fd4e 100644
--- a/target/i386/tcg/seg_helper.c
+++ b/target/i386/tcg/seg_helper.c
@@ -229,7 +229,7 @@ static void tss_load_seg(CPUX86State *env, X86Seg seg_reg,
int selector,
static void tss_set_busy(CPUX86State *env, int tss_selector, bool value,
uintptr_t retaddr)
{
- target_ulong ptr = env->gdt.base + (env->tr.selector & ~7);
+ target_ulong ptr = env->gdt.base + (tss_selector & ~7);
uint32_t e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr);
if (value) {
--
2.41.0
- [PULL 0/5] -Wshadow=local patches for 2023-10-12, Markus Armbruster, 2023/10/12
- [PULL 1/5] libvduse: Fix compiler warning with -Wshadow=local, Markus Armbruster, 2023/10/12
- [PULL 3/5] hw/virtio/virtio-gpu: Fix compiler warning when compiling with -Wshadow, Markus Armbruster, 2023/10/12
- [PULL 2/5] libvhost-user: Fix compiler warning with -Wshadow=local, Markus Armbruster, 2023/10/12
- [PULL 4/5] contrib/vhost-user-gpu: Fix compiler warning when compiling with -Wshadow, Markus Armbruster, 2023/10/12
- [PULL 5/5] target/i386: fix shadowed variable pasto,
Markus Armbruster <=
- Re: [PULL 0/5] -Wshadow=local patches for 2023-10-12, Stefan Hajnoczi, 2023/10/16