[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] intel_iommu: cleanup vtd_interrupt_remap_msi()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 6/7] intel_iommu: cleanup vtd_interrupt_remap_msi() |
Date: |
Fri, 16 Jun 2017 18:50:01 +0300 |
From: Peter Xu <address@hidden>
Move the memcpy upper into where needed, then share the trace so that we
trace every correct remapping.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/intel_iommu.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 24bdd00..a9b59bd 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2520,7 +2520,8 @@ static int vtd_interrupt_remap_msi(IntelIOMMUState *iommu,
trace_vtd_ir_remap_msi_req(origin->address, origin->data);
if (!iommu || !iommu->intr_enabled) {
- goto do_not_translate;
+ memcpy(translated, origin, sizeof(*origin));
+ goto out;
}
if (origin->address & VTD_MSI_ADDR_HI_MASK) {
@@ -2537,7 +2538,8 @@ static int vtd_interrupt_remap_msi(IntelIOMMUState *iommu,
/* This is compatible mode. */
if (addr.addr.int_mode != VTD_IR_INT_FORMAT_REMAP) {
- goto do_not_translate;
+ memcpy(translated, origin, sizeof(*origin));
+ goto out;
}
index = addr.addr.index_h << 15 | le16_to_cpu(addr.addr.index_l);
@@ -2589,13 +2591,9 @@ static int vtd_interrupt_remap_msi(IntelIOMMUState
*iommu,
/* Translate VTDIrq to MSI message */
vtd_generate_msi_message(&irq, translated);
+out:
trace_vtd_ir_remap_msi(origin->address, origin->data,
translated->address, translated->data);
-
- return 0;
-
-do_not_translate:
- memcpy(translated, origin, sizeof(*origin));
return 0;
}
--
MST
- [Qemu-devel] [PULL 0/7] pc: fixes, cleanups, features, Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 1/7] q35/mch: implement extended TSEG sizes, Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 2/7] tests/q35-test: push down qtest_start / qtest_end to test case(s), Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 3/7] tests/q35-test: add TSEG size checks, Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 5/7] intel_iommu: cleanup vtd_{do_}iommu_translate(), Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 6/7] intel_iommu: cleanup vtd_interrupt_remap_msi(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 7/7] hw/i386: fix nvdimm check error path, Michael S. Tsirkin, 2017/06/16
- [Qemu-devel] [PULL 4/7] intel_iommu: switching the rest DPRINTF to trace, Michael S. Tsirkin, 2017/06/16
- Re: [Qemu-devel] [PULL 0/7] pc: fixes, cleanups, features, Peter Maydell, 2017/06/22