From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfFtK-0006RM-OH for qemu-devel@nongnu.org; Thu, 14 Jun 2012 15:39:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfFtI-0002dz-Oq for qemu-devel@nongnu.org; Thu, 14 Jun 2012 15:39:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfFtI-0002dr-Fp for qemu-devel@nongnu.org; Thu, 14 Jun 2012 15:39:36 -0400 Date: Thu, 14 Jun 2012 22:40:05 +0300 From: "Michael S. Tsirkin" Message-ID: <20120614194005.GF19807@redhat.com> References: <1339693309-15192-1-git-send-email-anthony.perard@citrix.com> <1339693309-15192-9-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1339693309-15192-9-git-send-email-anthony.perard@citrix.com> Subject: Re: [Qemu-devel] [PATCH V13 8/9] Introduce apic-msidef.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony PERARD Cc: Jan Kiszka , Anthony Liguori , Stefano Stabellini , QEMU-devel , Xen Devel On Thu, Jun 14, 2012 at 06:01:48PM +0100, Anthony PERARD wrote: > This patch move the msi definition from apic.c to apic-msidef.h. So it can be > used also by other .c files. > > Signed-off-by: Anthony PERARD > Acked-by: Stefano Stabellini Acked-by: Michael S. Tsirkin > --- > hw/apic-msidef.h | 30 ++++++++++++++++++++++++++++++ > hw/apic.c | 11 +---------- > 2 files changed, 31 insertions(+), 10 deletions(-) > create mode 100644 hw/apic-msidef.h > > diff --git a/hw/apic-msidef.h b/hw/apic-msidef.h > new file mode 100644 > index 0000000..6e2eb71 > --- /dev/null > +++ b/hw/apic-msidef.h > @@ -0,0 +1,30 @@ > +#ifndef HW_APIC_MSIDEF_H > +#define HW_APIC_MSIDEF_H > + > +/* > + * Intel APIC constants: from include/asm/msidef.h > + */ > + > +/* > + * Shifts for MSI data > + */ > + > +#define MSI_DATA_VECTOR_SHIFT 0 > +#define MSI_DATA_VECTOR_MASK 0x000000ff > + > +#define MSI_DATA_DELIVERY_MODE_SHIFT 8 > +#define MSI_DATA_LEVEL_SHIFT 14 > +#define MSI_DATA_TRIGGER_SHIFT 15 > + > +/* > + * Shift/mask fields for msi address > + */ > + > +#define MSI_ADDR_DEST_MODE_SHIFT 2 > + > +#define MSI_ADDR_REDIRECTION_SHIFT 3 > + > +#define MSI_ADDR_DEST_ID_SHIFT 12 > +#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 > + > +#endif /* HW_APIC_MSIDEF_H */ > diff --git a/hw/apic.c b/hw/apic.c > index 5fbf01c..60552df 100644 > --- a/hw/apic.c > +++ b/hw/apic.c > @@ -23,19 +23,10 @@ > #include "host-utils.h" > #include "trace.h" > #include "pc.h" > +#include "apic-msidef.h" > > #define MAX_APIC_WORDS 8 > > -/* Intel APIC constants: from include/asm/msidef.h */ > -#define MSI_DATA_VECTOR_SHIFT 0 > -#define MSI_DATA_VECTOR_MASK 0x000000ff > -#define MSI_DATA_DELIVERY_MODE_SHIFT 8 > -#define MSI_DATA_TRIGGER_SHIFT 15 > -#define MSI_DATA_LEVEL_SHIFT 14 > -#define MSI_ADDR_DEST_MODE_SHIFT 2 > -#define MSI_ADDR_DEST_ID_SHIFT 12 > -#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 > - > #define SYNC_FROM_VAPIC 0x1 > #define SYNC_TO_VAPIC 0x2 > #define SYNC_ISR_IRR_TO_VAPIC 0x4 > -- > Anthony PERARD