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

apic_internal.h: make some apic_get_* functions externally visible

Browse Source 
Move apic_get_bit(), apic_set_bit() to apic_internal.h, make the apic_get_ppr
symbol external. It's necessary to work with isr, tmr, irr and ppr outside
hw/intc/apic.c

Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Andreas Färber <afaerber@suse.de>
Message-Id: <1442927901-1084-2-git-send-email-den@openvz.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pavel Butsykin 2015-09-22 16:18:13 +03:00 committed by Paolo Bonzini
parent 2f5a3b1252
commit 82a5e042fa
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/intc/apic.c
View File

@ -51,14 +51,6 @@ static int apic_ffs_bit(uint32_t value)
return ctz32(value); return ctz32(value);
} }
static inline void apic_set_bit(uint32_t *tab, int index)
{
int i, mask;
i = index >> 5;
mask = 1 << (index & 0x1f);
tab[i] |= mask;
}
static inline void apic_reset_bit(uint32_t *tab, int index) static inline void apic_reset_bit(uint32_t *tab, int index)
{ {
int i, mask; int i, mask;
@ -67,14 +59,6 @@ static inline void apic_reset_bit(uint32_t *tab, int index)
tab[i] &= ~mask; tab[i] &= ~mask;
} }
static inline int apic_get_bit(uint32_t *tab, int index)
{
int i, mask;
i = index >> 5;
mask = 1 << (index & 0x1f);
return !!(tab[i] & mask);
}
/* return -1 if no bit is set */ /* return -1 if no bit is set */
static int get_highest_priority_int(uint32_t *tab) static int get_highest_priority_int(uint32_t *tab)
{ {
@ -318,7 +302,7 @@ static uint8_t apic_get_tpr(APICCommonState *s)
return s->tpr >> 4; return s->tpr >> 4;
} }
static int apic_get_ppr(APICCommonState *s) int apic_get_ppr(APICCommonState *s)
{ {
int tpr, isrv, ppr; int tpr, isrv, ppr;

18
include/hw/i386/apic_internal.h
View File

@ -147,4 +147,22 @@ void apic_enable_vapic(DeviceState *d, hwaddr paddr);
void vapic_report_tpr_access(DeviceState *dev, CPUState *cpu, target_ulong ip, void vapic_report_tpr_access(DeviceState *dev, CPUState *cpu, target_ulong ip,
TPRAccess access); TPRAccess access);
int apic_get_ppr(APICCommonState *s);
static inline void apic_set_bit(uint32_t *tab, int index)
{
int i, mask;
i = index >> 5;
mask = 1 << (index & 0x1f);
tab[i] |= mask;
}
static inline int apic_get_bit(uint32_t *tab, int index)
{
int i, mask;
i = index >> 5;
mask = 1 << (index & 0x1f);
return !!(tab[i] & mask);
}
#endif /* !QEMU_APIC_INTERNAL_H */ #endif /* !QEMU_APIC_INTERNAL_H */