From 89a289c7e9fa857f8b0af0c5f060efa7c0ebe6ba Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Thu, 12 Dec 2019 14:14:40 +0100
Subject: x86: move more x86-generic functions out of PC files

These are needed by microvm too, so move them outside of PC-specific files.
With this patch, microvm.c need not include pc.h anymore.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/kvm.c     | 2 +-
 target/i386/machine.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'target/i386')

diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index c7ff67a28b..55e626590b 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -35,7 +35,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "hw/i386/pc.h"
+#include "hw/i386/x86.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/i386/apic-msidef.h"
diff --git a/target/i386/machine.c b/target/i386/machine.c
index 2699eed94e..b6720d86b0 100644
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1,10 +1,10 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "migration/cpu.h"
 #include "hyperv.h"
+#include "hw/i386/x86.h"
 #include "kvm_i386.h"
 
 #include "sysemu/kvm.h"
-- 
cgit v1.2.3-55-g7522