From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9l-0001Fs-Qq for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeP9k-00011Y-TK for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:06:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeP9k-00011M-OY for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:06:56 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:42 +0200 Message-Id: <1442934371-12567-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* functions externally visible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , =?UTF-8?q?Andreas=20F=C3=83=C2=A4rber?= , Pavel Butsykin From: Pavel Butsykin 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 outsid= e hw/intc/apic.c Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Andreas F=C3=83=C2=A4rber Message-Id: <1442927901-1084-2-git-send-email-den@openvz.org> Signed-off-by: Paolo Bonzini --- 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); } =20 -static inline void apic_set_bit(uint32_t *tab, int index) -{ - int i, mask; - i =3D index >> 5; - mask =3D 1 << (index & 0x1f); - tab[i] |=3D 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 i= ndex) tab[i] &=3D ~mask; } =20 -static inline int apic_get_bit(uint32_t *tab, int index) -{ - int i, mask; - i =3D index >> 5; - mask =3D 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; } =20 -static int apic_get_ppr(APICCommonState *s) +int apic_get_ppr(APICCommonState *s) { int tpr, isrv, ppr; =20 diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.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_ulo= ng ip, TPRAccess access); =20 +int apic_get_ppr(APICCommonState *s); + +static inline void apic_set_bit(uint32_t *tab, int index) +{ + int i, mask; + i =3D index >> 5; + mask =3D 1 << (index & 0x1f); + tab[i] |=3D mask; +} + +static inline int apic_get_bit(uint32_t *tab, int index) +{ + int i, mask; + i =3D index >> 5; + mask =3D 1 << (index & 0x1f); + return !!(tab[i] & mask); +} + #endif /* !QEMU_APIC_INTERNAL_H */ --=20 2.5.0