From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M1jPu-0001HL-Mf for qemu-devel@nongnu.org; Wed, 06 May 2009 11:52:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M1jPp-0001Fd-KD for qemu-devel@nongnu.org; Wed, 06 May 2009 11:52:18 -0400 Received: from [199.232.76.173] (port=51961 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M1jPp-0001Fa-FG for qemu-devel@nongnu.org; Wed, 06 May 2009 11:52:13 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:18236) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M1jPo-0005gO-4U for qemu-devel@nongnu.org; Wed, 06 May 2009 11:52:12 -0400 Message-ID: <4A01B224.8080608@siemens.com> Date: Wed, 06 May 2009 17:52:04 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1241621382-21577-1-git-send-email-glommer@redhat.com> <1241621382-21577-2-git-send-email-glommer@redhat.com> <1241621382-21577-3-git-send-email-glommer@redhat.com> <1241621382-21577-4-git-send-email-glommer@redhat.com> <1241621382-21577-5-git-send-email-glommer@redhat.com> In-Reply-To: <1241621382-21577-5-git-send-email-glommer@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 4/4] move apic functions to a separate apic.h header List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Glauber Costa Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Glauber Costa wrote: > Later on, we'll want to call an apic function from helper.c. > The inclusion of pc.h, besides totally ugly, leads to a lot of > clashes. > > Signed-off-by: Glauber Costa > --- > hw/apic.c | 1 + > hw/apic.h | 19 +++++++++++++++++++ > hw/ioapic.c | 1 + > hw/mc146818rtc.c | 1 + > hw/pc.c | 1 + > hw/pc.h | 15 --------------- > 6 files changed, 23 insertions(+), 15 deletions(-) > create mode 100644 hw/apic.h > > diff --git a/hw/apic.c b/hw/apic.c > index d63d74b..72dbe88 100644 > --- a/hw/apic.c > +++ b/hw/apic.c > @@ -19,6 +19,7 @@ > */ > #include "hw.h" > #include "pc.h" > +#include "apic.h" Does it still need pc.h then? > #include "qemu-timer.h" > #include "host-utils.h" > > diff --git a/hw/apic.h b/hw/apic.h > new file mode 100644 > index 0000000..2437e9f > --- /dev/null > +++ b/hw/apic.h > @@ -0,0 +1,19 @@ > +#ifndef _APIC_H_ > +#define _APIC_H_ "APIC_H", otherwise fine. > + > +/* APIC */ > +typedef struct IOAPICState IOAPICState; > +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); > +IOAPICState *ioapic_init(void); > +void ioapic_set_irq(void *opaque, int vector, int level); > +void apic_reset_irq_delivered(void); > +int apic_get_irq_delivered(void); > + > +#endif > diff --git a/hw/ioapic.c b/hw/ioapic.c > index 317c2c2..064f9ce 100644 > --- a/hw/ioapic.c > +++ b/hw/ioapic.c > @@ -22,6 +22,7 @@ > */ > > #include "hw.h" > +#include "apic.h" > #include "pc.h" > #include "qemu-timer.h" > #include "host-utils.h" > diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c > index 888b85a..b71624f 100644 > --- a/hw/mc146818rtc.c > +++ b/hw/mc146818rtc.c > @@ -25,6 +25,7 @@ > #include "qemu-timer.h" > #include "sysemu.h" > #include "pc.h" > +#include "apic.h" > #include "isa.h" > #include "hpet_emul.h" > > diff --git a/hw/pc.c b/hw/pc.c > index 06d1fca..2035705 100644 > --- a/hw/pc.c > +++ b/hw/pc.c > @@ -23,6 +23,7 @@ > */ > #include "hw.h" > #include "pc.h" > +#include "apic.h" > #include "fdc.h" > #include "pci.h" > #include "block.h" > diff --git a/hw/pc.h b/hw/pc.h > index 50e6c39..417ff65 100644 > --- a/hw/pc.h > +++ b/hw/pc.h > @@ -40,21 +40,6 @@ uint32_t pic_intack_read(PicState2 *s); > void pic_info(Monitor *mon); > void irq_info(Monitor *mon); > > -/* APIC */ > -typedef struct IOAPICState IOAPICState; > -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); > -IOAPICState *ioapic_init(void); > -void ioapic_set_irq(void *opaque, int vector, int level); > -void apic_reset_irq_delivered(void); > -int apic_get_irq_delivered(void); > - > /* i8254.c */ > > #define PIT_FREQ 1193182 Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux