[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 42/74] i386/hax-all: convert to cpu_interrupt_request
From: |
Robert Foley |
Subject: |
[PATCH v9 42/74] i386/hax-all: convert to cpu_interrupt_request |
Date: |
Thu, 21 May 2020 12:39:39 -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>
[RF: Converted new code to cpu_interrupt_request]
Signed-off-by: Robert Foley <address@hidden>
---
target/i386/hax-all.c | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
index 1edd6c77df..66de14b27b 100644
--- a/target/i386/hax-all.c
+++ b/target/i386/hax-all.c
@@ -285,7 +285,7 @@ int hax_vm_destroy(struct hax_vm *vm)
static void hax_handle_interrupt(CPUState *cpu, int mask)
{
- cpu->interrupt_request |= mask;
+ cpu_interrupt_request_or(cpu, mask);
if (!qemu_cpu_is_self(cpu)) {
qemu_cpu_kick(cpu);
@@ -419,7 +419,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)
* Unlike KVM, HAX kernel check for the eflags, instead of qemu
*/
if (ht->ready_for_interrupt_injection &&
- (cpu->interrupt_request & CPU_INTERRUPT_HARD)) {
+ (cpu_interrupt_request(cpu) & CPU_INTERRUPT_HARD)) {
int irq;
irq = cpu_get_pic_interrupt(env);
@@ -433,7 +433,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)
* interrupt, request an interrupt window exit. This will
* cause a return to userspace as soon as the guest is ready to
* receive interrupts. */
- if ((cpu->interrupt_request & CPU_INTERRUPT_HARD)) {
+ if ((cpu_interrupt_request(cpu) & CPU_INTERRUPT_HARD)) {
ht->request_interrupt_window = 1;
} else {
ht->request_interrupt_window = 0;
@@ -472,7 +472,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
return 0;
}
- if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
+ if (cpu_interrupt_request(cpu) & CPU_INTERRUPT_POLL) {
cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
apic_poll_irq(x86_cpu->apic_state);
}
@@ -495,20 +495,20 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
* c) INIT signal;
* d) SIPI signal.
*/
- if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) &&
+ if (((cpu_interrupt_request(cpu) & CPU_INTERRUPT_HARD) &&
(env->eflags & IF_MASK)) ||
- (cpu->interrupt_request & CPU_INTERRUPT_NMI)) {
+ (cpu_interrupt_request(cpu) & CPU_INTERRUPT_NMI)) {
cpu_halted_set(cpu, 0);
}
- if (cpu->interrupt_request & CPU_INTERRUPT_INIT) {
+ if (cpu_interrupt_request(cpu) & CPU_INTERRUPT_INIT) {
DPRINTF("\nhax_vcpu_hax_exec: handling INIT for %d\n",
cpu->cpu_index);
do_cpu_init(x86_cpu);
hax_vcpu_sync_state(env, 1);
}
- if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) {
+ if (cpu_interrupt_request(cpu) & CPU_INTERRUPT_SIPI) {
DPRINTF("hax_vcpu_hax_exec: handling SIPI for %d\n",
cpu->cpu_index);
hax_vcpu_sync_state(env, 0);
@@ -577,13 +577,17 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
ret = -1;
break;
case HAX_EXIT_HLT:
- if (!(cpu->interrupt_request & CPU_INTERRUPT_HARD) &&
- !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) {
- /* hlt instruction with interrupt disabled is shutdown */
- env->eflags |= IF_MASK;
- cpu_halted_set(cpu, 1);
- cpu->exception_index = EXCP_HLT;
- ret = 1;
+ {
+ uint32_t interrupt_request = cpu_interrupt_request(cpu);
+
+ if (!(interrupt_request & CPU_INTERRUPT_HARD) &&
+ !(interrupt_request & CPU_INTERRUPT_NMI)) {
+ /* hlt instruction with interrupt disabled is shutdown */
+ env->eflags |= IF_MASK;
+ cpu_halted_set(cpu, 1);
+ cpu->exception_index = EXCP_HLT;
+ ret = 1;
+ }
}
break;
/* these situations will continue to hax module */
--
2.17.1
- [PATCH v9 32/74] cpu: convert to cpu_halted, (continued)
- [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, 2020/05/21
- [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 <=
- [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
- [PATCH v9 50/74] m68k: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 51/74] mips: convert to cpu_interrupt_request, Robert Foley, 2020/05/21