hw/display/vga: "vga_int.h" requires "ui/console.h"

since The VGACommonState struct has a GraphicHwOps *hw_ops member,
then remove the now unnecessary includes.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Thomas Huth <[email protected]>
Signed-off-by: Michael Tokarev <[email protected]>

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index bc32bf1e3956726ad9916de7ef4c8ab6c9dafec3..138ae961b9baeabc0f3014ec0c33cdd75a37775d 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -31,7 +31,6 @@
 #include "trace.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "vga_int.h"
 #include "hw/loader.h"

diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index f6556adb73984f0776b85ab90aba1c7ef614921d..8668a8e05ac5c4ba56e35167d675d6d5cbbecb9a 100644 (file)
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -3,7 +3,6 @@
 
 #include "qemu-common.h"
 
-#include "ui/console.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"

diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 51ccbccc41927f1f73f07741c9f44ee519c0af47..68c4d6e23e3adb17f7120657f3e03286e34733c0 100644 (file)
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 1af95562f247f953e3c0c826d684c90288973eb9..26f69fd40acceda2389e872a7f7659045e8ebfe4 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 7adb89fcb4d18ed0baa297a6aaebcc53bb2de57b..1674bd3581afed8aeff7f7242bb21e230478559d 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vga.c b/hw/display/vga.c
index ce95b40e5c388f4d10683516a85d29d6d170e354..4163b532e08af09a0ca6429b62e8901d91182d2b 100644 (file)
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index ad34a1f0481bb273b31e9c154b9f77db4178e26c..fe23b81442635a5bb94ae1e50b38fca0d14c42b4 100644 (file)
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -25,8 +25,9 @@
 #ifndef HW_VGA_INT_H
 #define HW_VGA_INT_H
 
-#include "hw/hw.h"
+#include "exec/ioport.h"
 #include "exec/memory.h"
+#include "ui/console.h"
 
 #define ST01_V_RETRACE      0x08
 #define ST01_DISP_ENABLE    0x01

diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index f9b017d86bbcf51387c9304315606ae52e3d1894..baa74ba82c8e266ed0228b564fc469c43396381a 100644 (file)
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "ui/console.h"
 #include "vga_int.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qapi/error.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 0e6673a9119fbacb727ce73fe8e268d5931e3fcd..bd3e8b358676baebe0d2f4c280f7e9d3bbe21b73 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -26,7 +26,6 @@
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "trace.h"
-#include "ui/console.h"
 #include "ui/vnc.h"
 #include "hw/pci/pci.h"