[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 39/73] i386: convert to cpu_interrupt_request
From: |
Robert Foley |
Subject: |
[PATCH v10 39/73] i386: convert to cpu_interrupt_request |
Date: |
Wed, 17 Jun 2020 17:01:57 -0400 |
From: "Emilio G. Cota" <cota@braap.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Robert Foley <robert.foley@linaro.org>
---
target/i386/cpu.c | 2 +-
target/i386/helper.c | 4 ++--
target/i386/svm_helper.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 4d3ab0f3a2..59ac96bd01 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7093,7 +7093,7 @@ int x86_cpu_pending_interrupt(CPUState *cs, int
interrupt_request)
static bool x86_cpu_has_work(CPUState *cs)
{
- return x86_cpu_pending_interrupt(cs, cs->interrupt_request) != 0;
+ return x86_cpu_pending_interrupt(cs, cpu_interrupt_request(cs)) != 0;
}
static void x86_disas_set_info(CPUState *cs, disassemble_info *info)
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 058de4073d..623a7299ac 100644
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -1029,12 +1029,12 @@ void do_cpu_init(X86CPU *cpu)
CPUState *cs = CPU(cpu);
CPUX86State *env = &cpu->env;
CPUX86State *save = g_new(CPUX86State, 1);
- int sipi = cs->interrupt_request & CPU_INTERRUPT_SIPI;
+ int sipi = cpu_interrupt_request(cs) & CPU_INTERRUPT_SIPI;
*save = *env;
cpu_reset(cs);
- cs->interrupt_request = sipi;
+ cpu_interrupt_request_set(cs, sipi);
memcpy(&env->start_init_save, &save->start_init_save,
offsetof(CPUX86State, end_init_save) -
offsetof(CPUX86State, start_init_save));
diff --git a/target/i386/svm_helper.c b/target/i386/svm_helper.c
index 63eb136743..c739bf0d9c 100644
--- a/target/i386/svm_helper.c
+++ b/target/i386/svm_helper.c
@@ -316,7 +316,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int
next_eip_addend)
if (int_ctl & V_IRQ_MASK) {
CPUState *cs = env_cpu(env);
- cs->interrupt_request |= CPU_INTERRUPT_VIRQ;
+ cpu_interrupt_request_or(cs, CPU_INTERRUPT_VIRQ);
}
/* maybe we need to inject an event */
@@ -674,7 +674,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code,
uint64_t exit_info_1)
env->vm_vmcb + offsetof(struct vmcb, control.int_ctl));
int_ctl &= ~(V_TPR_MASK | V_IRQ_MASK);
int_ctl |= env->v_tpr & V_TPR_MASK;
- if (cs->interrupt_request & CPU_INTERRUPT_VIRQ) {
+ if (cpu_interrupt_request(cs) & CPU_INTERRUPT_VIRQ) {
int_ctl |= V_IRQ_MASK;
}
x86_stl_phys(cs,
--
2.17.1
- [PATCH v10 32/73] cpu: define cpu_interrupt_request helpers, (continued)
- [PATCH v10 32/73] cpu: define cpu_interrupt_request helpers, Robert Foley, 2020/06/17
- [PATCH v10 22/73] m68k: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 23/73] mips: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 28/73] gdbstub: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 34/73] exec: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 30/73] cpu-exec: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 33/73] ppc: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 31/73] cpu: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 35/73] i386: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 37/73] openrisc: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 39/73] i386: convert to cpu_interrupt_request,
Robert Foley <=
- [PATCH v10 24/73] riscv: convert to cpu_halted, Robert Foley, 2020/06/17
- [PATCH v10 38/73] arm: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 36/73] s390x: use cpu_reset_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 41/73] i386/hax-all: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 42/73] i386/whpx-all: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 40/73] i386/kvm: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 43/73] i386/hvf: convert to cpu_request_interrupt, Robert Foley, 2020/06/17
- [PATCH v10 45/73] sh4: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 44/73] ppc: convert to cpu_interrupt_request, Robert Foley, 2020/06/17
- [PATCH v10 46/73] cris: convert to cpu_interrupt_request, Robert Foley, 2020/06/17