58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
|
From 885c1bf512582757f9d7e2e360701f72a9d6e95f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 12 Dec 2024 11:27:23 +0800
|
||
|
|
Subject: [PATCH] hvf: remove unused but set variable
|
||
|
|
|
||
|
|
cheery-pick from 19d542cc0bce0b3641e80444374f9ffd8294a15b
|
||
|
|
|
||
|
|
fixes associated warning when building on MacOS.
|
||
|
|
|
||
|
|
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
|
||
|
|
Link: https://lore.kernel.org/r/20241023182922.1040964-1-pierrick.bouvier@linaro.org
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/i386/hvf/x86_task.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
|
||
|
|
index f09bfbdda5..cdea2ea69d 100644
|
||
|
|
--- a/target/i386/hvf/x86_task.c
|
||
|
|
+++ b/target/i386/hvf/x86_task.c
|
||
|
|
@@ -122,7 +122,6 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea
|
||
|
|
load_regs(cpu);
|
||
|
|
|
||
|
|
struct x86_segment_descriptor curr_tss_desc, next_tss_desc;
|
||
|
|
- int ret;
|
||
|
|
x68_segment_selector old_tss_sel = vmx_read_segment_selector(cpu, R_TR);
|
||
|
|
uint64_t old_tss_base = vmx_read_segment_base(cpu, R_TR);
|
||
|
|
uint32_t desc_limit;
|
||
|
|
@@ -138,7 +137,7 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea
|
||
|
|
if (reason == TSR_IDT_GATE && gate_valid) {
|
||
|
|
int dpl;
|
||
|
|
|
||
|
|
- ret = x86_read_call_gate(cpu, &task_gate_desc, gate);
|
||
|
|
+ x86_read_call_gate(cpu, &task_gate_desc, gate);
|
||
|
|
|
||
|
|
dpl = task_gate_desc.dpl;
|
||
|
|
x68_segment_selector cs = vmx_read_segment_selector(cpu, R_CS);
|
||
|
|
@@ -167,11 +166,12 @@ void vmx_handle_task_switch(CPUState *cpu, x68_segment_selector tss_sel, int rea
|
||
|
|
x86_write_segment_descriptor(cpu, &next_tss_desc, tss_sel);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (next_tss_desc.type & 8)
|
||
|
|
- ret = task_switch_32(cpu, tss_sel, old_tss_sel, old_tss_base, &next_tss_desc);
|
||
|
|
- else
|
||
|
|
+ if (next_tss_desc.type & 8) {
|
||
|
|
+ task_switch_32(cpu, tss_sel, old_tss_sel, old_tss_base, &next_tss_desc);
|
||
|
|
+ } else {
|
||
|
|
//ret = task_switch_16(cpu, tss_sel, old_tss_sel, old_tss_base, &next_tss_desc);
|
||
|
|
VM_PANIC("task_switch_16");
|
||
|
|
+ }
|
||
|
|
|
||
|
|
macvm_set_cr0(cpu->accel->fd, rvmcs(cpu->accel->fd, VMCS_GUEST_CR0) |
|
||
|
|
CR0_TS_MASK);
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|