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 <anthony.perard@citrix.com>
> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 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