[Qemu-devel] [PATCH 3/3] intel_iommu: cleanup vtd_interrupt_remap_msi()

[Peter Xu]

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>
---
 hw/i386/intel_iommu.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index f94fc4e..dc65270 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2499,7 +2499,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) {
@@ -2516,7 +2517,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);
@@ -2568,15 +2570,12 @@ 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(ioapic_irq ? "IOAPIC" : "MSI",
                            origin->address, origin->data,
                            translated->address, translated->data);
 
     return 0;
-
-do_not_translate:
-    memcpy(translated, origin, sizeof(*origin));
-    return 0;
 }
 
 static int vtd_int_remap(X86IOMMUState *iommu, MSIMessage *src,
-- 
2.7.4