summaryrefslogtreecommitdiffstats
path: root/hw/display
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2017-10-17 18:44:21 +0200
committerMichael Tokarev2017-12-18 15:07:02 +0100
commit866e2b3727b6f9f55d5921365f2c97ecf763de65 (patch)
tree0fc961152abf28b3fafe00da9b93a9f7c3c9e595 /hw/display
parenthw/display/vga: "vga_int.h" requires "ui/console.h" (diff)
downloadqemu-866e2b3727b6f9f55d5921365f2c97ecf763de65.tar.gz
qemu-866e2b3727b6f9f55d5921365f2c97ecf763de65.tar.xz
qemu-866e2b3727b6f9f55d5921365f2c97ecf763de65.zip
hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"
and remove the old i386/pc dependency. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/display')
-rw-r--r--hw/display/vga-isa-mm.c3
-rw-r--r--hw/display/vga-isa.c2
-rw-r--r--hw/display/vga.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 68c4d6e23e..e887b45651 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -23,10 +23,9 @@
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/display/vga.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
-#include "qemu/timer.h"
#define VGA_RAM_SIZE (8192 * 1024)
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 26f69fd40a..469834add5 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,7 @@
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/isa/isa.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
#include "qemu/timer.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 4163b532e0..a0412000a5 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/display/vga.h"
#include "hw/pci/pci.h"
#include "vga_int.h"
#include "vga_regs.h"