mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-29 14:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

intel_iommu: cleanup vtd_interrupt_remap_msi()

Browse Source 
Move the memcpy upper into where needed, then share the trace so that we
trace every correct remapping.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Peter Xu 2017-06-09 21:53:29 +08:00 committed by Michael S. Tsirkin
parent b9313021f3
commit e7a3b91fdf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/i386/intel_iommu.c
View File

@ -2520,7 +2520,8 @@ static int vtd_interrupt_remap_msi(IntelIOMMUState *iommu,
trace_vtd_ir_remap_msi_req(origin->address, origin->data); trace_vtd_ir_remap_msi_req(origin->address, origin->data);
if (!iommu || !iommu->intr_enabled) { if (!iommu || !iommu->intr_enabled) {
goto do_not_translate; memcpy(translated, origin, sizeof(*origin));
goto out;
} }
if (origin->address & VTD_MSI_ADDR_HI_MASK) { if (origin->address & VTD_MSI_ADDR_HI_MASK) {
@ -2537,7 +2538,8 @@ static int vtd_interrupt_remap_msi(IntelIOMMUState *iommu,
/* This is compatible mode. */ /* This is compatible mode. */
if (addr.addr.int_mode != VTD_IR_INT_FORMAT_REMAP) { 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); 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 */ /* Translate VTDIrq to MSI message */
vtd_generate_msi_message(&irq, translated); vtd_generate_msi_message(&irq, translated);
out:
trace_vtd_ir_remap_msi(origin->address, origin->data, trace_vtd_ir_remap_msi(origin->address, origin->data,
translated->address, translated->data); translated->address, translated->data);
return 0;
do_not_translate:
memcpy(translated, origin, sizeof(*origin));
return 0; return 0;
} }