From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliN4-0001nH-5I for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YliN3-0006ld-17 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliN2-0006lR-0Y for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:36 -0400 From: Eduardo Habkost Date: Fri, 24 Apr 2015 15:30:07 -0300 Message-Id: <1429900209-31811-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1429900209-31811-1-git-send-email-ehabkost@redhat.com> References: <1429900209-31811-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] target-i386: Use X86CPU on cpu_get_pic_interrupt() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Riku Voipio , Blue Swirl , Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson Cc: Blue Swirl Cc: Riku Voipio Cc: "Michael S. Tsirkin" Signed-off-by: Eduardo Habkost --- bsd-user/main.c | 2 +- hw/i386/pc.c | 3 +-- linux-user/main.c | 2 +- target-i386/cpu.h | 2 +- target-i386/kvm.c | 2 +- target-i386/seg_helper.c | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 1bb2754..85d0860 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -62,7 +62,7 @@ void gemu_log(const char *fmt, ...) } #if defined(TARGET_I386) -int cpu_get_pic_interrupt(CPUX86State *env) +int cpu_get_pic_interrupt(X86CPU *cpu) { return -1; } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a8e6be1..f86c58e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -185,9 +185,8 @@ void cpu_smm_update(CPUX86State *env) /* IRQ handling */ -int cpu_get_pic_interrupt(CPUX86State *env) +int cpu_get_pic_interrupt(X86CPU *cpu) { - X86CPU *cpu = x86_env_get_cpu(env); int intno; intno = apic_get_interrupt(cpu->apic_state); diff --git a/linux-user/main.c b/linux-user/main.c index a8adb04..e6a93b2 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -85,7 +85,7 @@ void gemu_log(const char *fmt, ...) } #if defined(TARGET_I386) -int cpu_get_pic_interrupt(CPUX86State *env) +int cpu_get_pic_interrupt(X86CPU *cpu) { return -1; } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5f4dab1..5eb8a79 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -986,7 +986,7 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void); int cpu_x86_support_mca_broadcast(X86CPU *cpu); -int cpu_get_pic_interrupt(CPUX86State *s); +int cpu_get_pic_interrupt(X86CPU *cpu); /* MSDOS compatibility mode FPU exception support */ void cpu_set_ferr(CPUX86State *s); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index bb2477d..50b2978 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2215,7 +2215,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) int irq; cpu->interrupt_request &= ~CPU_INTERRUPT_HARD; - irq = cpu_get_pic_interrupt(env); + irq = cpu_get_pic_interrupt(x86_cpu); if (irq >= 0) { struct kvm_interrupt intr; diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c index 2bc757a..ff361ce 100644 --- a/target-i386/seg_helper.c +++ b/target-i386/seg_helper.c @@ -1325,7 +1325,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cpu_svm_check_intercept_param(env, SVM_EXIT_INTR, 0); cs->interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); - intno = cpu_get_pic_interrupt(env); + intno = cpu_get_pic_interrupt(cpu); qemu_log_mask(CPU_LOG_TB_IN_ASM, "Servicing hardware INT=0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); -- 2.1.0