[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 40/74] i386: convert to cpu_interrupt_request
From: |
Robert Foley |
Subject: |
[PATCH v9 40/74] i386: convert to cpu_interrupt_request |
Date: |
Thu, 21 May 2020 12:39:37 -0400 |
From: "Emilio G. Cota" <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Robert Foley <address@hidden>
---
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 9e8ae1569f..2b60537b23 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7051,7 +7051,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 v9 27/74] sparc: convert to cpu_halted, (continued)
- [PATCH v9 27/74] sparc: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 31/74] cpu-exec: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 32/74] cpu: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 33/74] cpu: define cpu_interrupt_request helpers, Robert Foley, 2020/05/21
- [PATCH v9 34/74] ppc: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 35/74] exec: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 36/74] i386: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 37/74] s390x: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 38/74] openrisc: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 39/74] arm: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 40/74] i386: convert to cpu_interrupt_request,
Robert Foley <=
- [PATCH v9 41/74] i386/kvm: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 42/74] i386/hax-all: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 43/74] i386/whpx-all: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 44/74] i386/hvf: convert to cpu_request_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 45/74] ppc: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 46/74] sh4: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 47/74] cris: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 48/74] hppa: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 49/74] lm32: convert to cpu_interrupt_request, Robert Foley, 2020/05/21