accel/tcg: Restrict IOMMU declarations
PATCH v3 1/1 accel/tcg: Restrict IOMMU declarations
Move the two TCG-specific IOMMU method declarations from the generic "exec/cpu-common.h" header to "accel/tcg/iommu.h".
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- include/accel/tcg/iommu.h | 7 +++++++ include/exec/cpu-common.h | 3 --- accel/tcg/cpu-exec.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-)
include/accel/tcg/iommu.h +7 -0
@@ -7,6 +7,10 @@#ifndef ACCEL_TCG_IOMMU_H #define ACCEL_TCG_IOMMU_H +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif +#ifdef CONFIG_USER_ONLY #error Cannot include accel/tcg/iommu.h from user emulation#endif
@@ -14,6 +18,9 @@#include "exec/hwaddr.h" #include "exec/memattrs.h" +void tcg_iommu_init_notifier_list (CPUState *cpu); +void tcg_iommu_free_notifier_list (CPUState *cpu); + MemoryRegionSection *address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
include/exec/cpu-common.h +0 -3
@@ -35,9 +35,6 @@ unsigned int cpu_list_generation_id_get(void);int cpu_get_free_index (void ); -void tcg_iommu_init_notifier_list (CPUState *cpu); -void tcg_iommu_free_notifier_list (CPUState *cpu); -/** * cpu_address_space_init: * @cpu: CPU to add this address space to
accel/tcg/cpu-exec.c +3 -1
@@ -26,7 +26,6 @@#include "accel/tcg/helper-retaddr.h" #include "trace.h" #include "disas/disas.h" -#include "exec/cpu-common.h" #include "exec/cpu-interrupt.h" #include "exec/page-protection.h" #include "exec/mmap-lock.h"
@@ -46,6 +45,9 @@#include "tb-context.h" #include "tb-internal.h" #include "internal-common.h" +#if !defined(CONFIG_USER_ONLY ) +#include "accel/tcg/iommu.h" +#endif /* -icount align implementation. */
Signature · 1 line
2.53.0
Quoted 9 lines · Philippe Mathieu-Daudé
Move the two TCG-specific IOMMU method declarations from the generic "
exec/cpu-common.h" header to "accel/tcg/iommu.h".Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/accel/tcg/iommu.h | 7 +++++++ include/exec/cpu-common.h | 3 --- accel/tcg/cpu-exec.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-)
Reviewed-by Richard Henderson <[email protected]>
r~
Philippe Mathieu-Daudé
AppliedQuoted 9 lines · Philippe Mathieu-Daudé
Move the two TCG-specific IOMMU method declarations from the generic "
exec/cpu-common.h" header to "accel/tcg/iommu.h".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/accel/tcg/iommu.h | 7 +++++++ include/exec/cpu-common.h | 3 --- accel/tcg/cpu-exec.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-)
Queued, thanks.