[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* function
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* functions externally visible |
Date: |
Tue, 22 Sep 2015 17:05:42 +0200 |
From: Pavel Butsykin <address@hidden>
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 <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Andreas Färber <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/intc/apic.c | 18 +-----------------
include/hw/i386/apic_internal.h | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 77b639c..52ac8b2 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -51,14 +51,6 @@ static int apic_ffs_bit(uint32_t 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)
{
int i, mask;
@@ -67,14 +59,6 @@ static inline void apic_reset_bit(uint32_t *tab, int index)
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 */
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;
}
-static int apic_get_ppr(APICCommonState *s)
+int apic_get_ppr(APICCommonState *s)
{
int tpr, isrv, ppr;
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 26632ac..5a213bc 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -147,4 +147,22 @@ void apic_enable_vapic(DeviceState *d, hwaddr paddr);
void vapic_report_tpr_access(DeviceState *dev, CPUState *cpu, target_ulong ip,
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 */
--
2.5.0
- [Qemu-devel] [PULL 10/48] MAINTAINERS: there is no PPC64 TCG backend anymore, (continued)
- [Qemu-devel] [PULL 10/48] MAINTAINERS: there is no PPC64 TCG backend anymore, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 09/48] get_maintainer.pl: \C is deprecated, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 11/48] MAINTAINERS: Add disassemblers to the various backends, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 12/48] MAINTAINERS: Add more s390 files, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 15/48] MAINTAINERS: add more devices to the PCI section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 16/48] MAINTAINERS: add maintainer for character device front-ends, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 13/48] MAINTAINERS: add IPack section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 17/48] ioapic: coalesce level interrupts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 14/48] MAINTAINERS: add more devices to the PC section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 18/48] ioapic: fix contents of arbitration register, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* functions externally visible,
Paolo Bonzini <=
- [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 21/48] apic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 22/48] apic_internal.h: fix formatting and drop unused consts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 24/48] hmp: added local apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 25/48] ioapic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 26/48] hmp: added io apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 29/48] linux-user: elfload: Provide default for elf_check_arch, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 27/48] hmp: implemented io apic dump state for TCG, Paolo Bonzini, 2015/09/22