mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apic: avoid passing CPUState from devices

Browse Source 
Pass only APICState from pc.c.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-06-19 10:42:08 +03:00
parent 9605111958
commit cf6d64bfd9
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/apic.c
View File

@ -94,7 +94,7 @@
#define MSI_ADDR_BASE 0xfee00000
#define MSI_ADDR_SIZE 0x100000
typedef struct APICState {
struct APICState {
CPUState *cpu_env;
uint32_t apicbase;
uint8_t id;
@ -118,7 +118,7 @@ typedef struct APICState {
QEMUTimer *timer;
int sipi_vector;
int wait_for_sipi;
} APICState;
};
static int apic_io_memory;
static APICState *local_apics[MAX_APICS + 1];
@ -167,9 +167,8 @@ static inline int get_bit(uint32_t *tab, int index)
return !!(tab[i] & mask);
}
static void apic_local_deliver(CPUState *env, int vector)
static void apic_local_deliver(APICState *s, int vector)
{
APICState *s = env->apic_state;
uint32_t lvt = s->lvt[vector];
int trigger_mode;
@ -180,15 +179,15 @@ static void apic_local_deliver(CPUState *env, int vector)
switch ((lvt >> 8) & 7) {
case APIC_DM_SMI:
cpu_interrupt(env, CPU_INTERRUPT_SMI);
cpu_interrupt(s->cpu_env, CPU_INTERRUPT_SMI);
break;
case APIC_DM_NMI:
cpu_interrupt(env, CPU_INTERRUPT_NMI);
cpu_interrupt(s->cpu_env, CPU_INTERRUPT_NMI);
break;
case APIC_DM_EXTINT:
cpu_interrupt(env, CPU_INTERRUPT_HARD);
cpu_interrupt(s->cpu_env, CPU_INTERRUPT_HARD);
break;
case APIC_DM_FIXED:
@ -200,12 +199,11 @@ static void apic_local_deliver(CPUState *env, int vector)
}
}
void apic_deliver_pic_intr(CPUState *env, int level)
void apic_deliver_pic_intr(APICState *s, int level)
{
if (level)
apic_local_deliver(env, APIC_LVT_LINT0);
else {
APICState *s = env->apic_state;
if (level) {
apic_local_deliver(s, APIC_LVT_LINT0);
} else {
uint32_t lvt = s->lvt[APIC_LVT_LINT0];
switch ((lvt >> 8) & 7) {
@ -215,7 +213,7 @@ void apic_deliver_pic_intr(CPUState *env, int level)
reset_bit(s->irr, lvt & 0xff);
/* fall through */
case APIC_DM_EXTINT:
cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
cpu_reset_interrupt(s->cpu_env, CPU_INTERRUPT_HARD);
break;
}
}
@ -591,9 +589,8 @@ static void apic_deliver(APICState *s, uint8_t dest, uint8_t dest_mode,
trigger_mode);
}
int apic_get_interrupt(CPUState *env)
int apic_get_interrupt(APICState *s)
{
APICState *s = env->apic_state;
int intno;
/* if the APIC is installed or enabled, we let the 8259 handle the
@ -615,9 +612,8 @@ int apic_get_interrupt(CPUState *env)
return intno;
}
int apic_accept_pic_intr(CPUState *env)
int apic_accept_pic_intr(APICState *s)
{
APICState *s = env->apic_state;
uint32_t lvt0;
if (!s)
@ -679,7 +675,7 @@ static void apic_timer(void *opaque)
{
APICState *s = opaque;
apic_local_deliver(s->cpu_env, APIC_LVT_TIMER);
apic_local_deliver(s, APIC_LVT_TIMER);
apic_timer_update(s, s->next_time);
}

8
hw/apic.h
View File

@ -1,14 +1,16 @@
#ifndef APIC_H
#define APIC_H
/* apic.c */
typedef struct APICState APICState;
void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
uint8_t delivery_mode,
uint8_t vector_num, uint8_t polarity,
uint8_t trigger_mode);
int apic_init(CPUState *env);
int apic_accept_pic_intr(CPUState *env);
void apic_deliver_pic_intr(CPUState *env, int level);
int apic_get_interrupt(CPUState *env);
int apic_accept_pic_intr(APICState *s);
void apic_deliver_pic_intr(APICState *s, int level);
int apic_get_interrupt(APICState *s);
void apic_reset_irq_delivered(void);
int apic_get_irq_delivered(void);

10
hw/pc.c
View File

@ -145,7 +145,7 @@ int cpu_get_pic_interrupt(CPUState *env)
{
int intno;
intno = apic_get_interrupt(env);
intno = apic_get_interrupt(env->apic_state);
if (intno >= 0) {
/* set irq request if a PIC irq is still pending */
/* XXX: improve that */
@ -153,8 +153,9 @@ int cpu_get_pic_interrupt(CPUState *env)
return intno;
}
/* read the irq from the PIC */
if (!apic_accept_pic_intr(env))
if (!apic_accept_pic_intr(env->apic_state)) {
return -1;
}
intno = pic_read_irq(isa_pic);
return intno;
@ -167,8 +168,9 @@ static void pic_irq_request(void *opaque, int irq, int level)
DPRINTF("pic_irqs: %s irq %d\n", level? "raise" : "lower", irq);
if (env->apic_state) {
while (env) {
if (apic_accept_pic_intr(env))
apic_deliver_pic_intr(env, level);
if (apic_accept_pic_intr(env->apic_state)) {
apic_deliver_pic_intr(env->apic_state, level);
}
env = env->next_cpu;
}
} else {