On Mon, Jul 04, 2016 at 06:14:41PM +0300, Michael S. Tsirkin wrote: > On Tue, Jun 21, 2016 at 03:47:33PM +0800, Peter Xu wrote: > > In ACPI DMA remapping report structure, enable INTR flag when specified. > > > > Signed-off-by: Peter Xu <pet...@redhat.com> > > --- > > hw/i386/acpi-build.c | 11 ++++++++++- > > include/hw/i386/intel_iommu.h | 2 ++ > > 2 files changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > > index 161f089..961ccd6a 100644 > > --- a/hw/i386/acpi-build.c > > +++ b/hw/i386/acpi-build.c > > @@ -57,6 +57,7 @@ > > > > #include "qapi/qmp/qint.h" > > #include "qom/qom-qobject.h" > > +#include "hw/i386/x86-iommu.h" > > > > /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and > > * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows > > @@ -2422,10 +2423,18 @@ build_dmar_q35(GArray *table_data, BIOSLinker > > *linker) > > > > AcpiTableDmar *dmar; > > AcpiDmarHardwareUnit *drhd; > > + uint8_t dmar_flags = 0; > > + X86IOMMUState *iommu = x86_iommu_get_default(); > > + > > + assert(iommu); > > + if (iommu->intr_supported) { > > + /* enable INTR for the IOMMU device */ > > + dmar_flags |= DMAR_REPORT_F_INTR; > > Please rewrite it: drop DMAR_REPORT_F_INTR macro, > and replace with literal + comment documenting > earliest spec version has it and the exact text > to look for in the spec.
For "literal", do you mean this? dmar_flags |= 0x1; Could I ask why we need to drop the macro? There are two possible flags here, bit 0 is for IR, bit 1 (not used in QEMU yet) for X2APIC_OPT_OUT. Macros seem to be more clear. Did I miss anything? Regarding to the comment, maybe: "enable INTR for the IOMMU device. See VT-d spec 8.1 (any version newer than Oct. 2014)" Thanks, -- peterx