>>> On 21.08.17 at 16:14, <wei.l...@citrix.com> wrote: > On Mon, Aug 21, 2017 at 03:09:12PM +0100, Wei Liu wrote: >> That header file is only used by x86. Merge is into the x86 header. >> >> Signed-off-by: Wei Liu <wei.l...@citrix.com> > [...] >> +#define HVM_IRQ_DPCI_MACH_PCI (1 << _HVM_IRQ_DPCI_MACH_PCI_SHIFT) >> +#define HVM_IRQ_DPCI_MACH_MSI (1 << _HVM_IRQ_DPCI_MACH_MSI_SHIFT) >> +#define HVM_IRQ_DPCI_MAPPED (1 << _HVM_IRQ_DPCI_MAPPED_SHIFT) >> +#define HVM_IRQ_DPCI_EOI_LATCH (1 << _HVM_IRQ_DPCI_EOI_LATCH_SHIFT) >> +#define HVM_IRQ_DPCI_GUEST_PCI (1 << _HVM_IRQ_DPCI_GUEST_PCI_SHIFT) >> +#define HVM_IRQ_DPCI_GUEST_MSI (1 << _HVM_IRQ_DPCI_GUEST_MSI_SHIFT) >> +#define HVM_IRQ_DPCI_IDENTITY_GSI (1 << _HVM_IRQ_DPCI_IDENTITY_GSI_SHIFT) >> +#define HVM_IRQ_DPCI_TRANSLATE (1 << _HVM_IRQ_DPCI_TRANSLATE_SHIFT) > > Hmm... I think I'd better change these to 1u > >> + >> +#define VMSI_DEST_ID_MASK 0xff >> +#define VMSI_RH_MASK 0x100 >> +#define VMSI_DM_MASK 0x200 >> +#define VMSI_DELIV_MASK 0x7000 >> +#define VMSI_TRIG_MODE 0x8000 >> + >> +#define GFLAGS_SHIFT_RH 8 >> +#define GFLAGS_SHIFT_DELIV_MODE 12 >> +#define GFLAGS_SHIFT_TRG_MODE 15 >> + >> +struct hvm_gmsi_info { >> + uint32_t gvec; >> + uint32_t gflags; >> + int dest_vcpu_id; /* -1 :multi-dest, non-negative: dest_vcpu_id */ >> + bool posted; /* directly deliver to guest via VT-d PI? */ >> +}; >> + >> +struct hvm_girq_dpci_mapping { >> + struct list_head list; >> + uint8_t bus; >> + uint8_t device; >> + uint8_t intx; >> + uint8_t machine_gsi; >> +}; >> + >> +#define NR_ISAIRQS 16 >> +#define NR_LINK 4 >> +#if defined(CONFIG_X86) >> +# define NR_HVM_DOMU_IRQS ARRAY_SIZE(((struct hvm_hw_vioapic *)0)->redirtbl) >> +#endif > > And this if defined is not needed any more after moving.
Wit these adjustments Acked-by: Jan Beulich <jbeul...@suse.com> Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel