[PATCH kvm-unit-tests 05/10] x86: leave VM setup out of vtd_init

[Paolo Bonzini <pbonzini@xxxxxxxxxx>]

Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
 lib/x86/intel-iommu.c | 4 ----
 x86/intel-iommu.c     | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/x86/intel-iommu.c b/lib/x86/intel-iommu.c
index af92fab..3f3f211 100644
--- a/lib/x86/intel-iommu.c
+++ b/lib/x86/intel-iommu.c
@@ -12,7 +12,6 @@
 
 #include "intel-iommu.h"
 #include "libcflat.h"
-#include "vm.h"
 #include "pci.h"
 #include "atomic.h"
 #include "alloc_page.h"
@@ -360,9 +359,6 @@ void vtd_setup_ioapic_irq(struct pci_dev *dev, int vector,
 
 void vtd_init(void)
 {
-	setup_vm();
-	smp_init();
-
 	vtd_reg_base = ioremap(Q35_HOST_BRIDGE_IOMMU_ADDR, PAGE_SIZE);
 
 	vtd_dump_init_info();
diff --git a/x86/intel-iommu.c b/x86/intel-iommu.c
index 82b8234..f24170d 100644
--- a/x86/intel-iommu.c
+++ b/x86/intel-iommu.c
@@ -132,6 +132,9 @@ static void vtd_test_ir(void)
 
 int main(int argc, char *argv[])
 {
+	setup_vm();
+	smp_init();
+
 	vtd_init();
 
 	report_prefix_push("vtd_init");
-- 
2.14.2