diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-10-17 13:44:20 -0300 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2017-12-18 17:07:02 +0300 |
| commit | e07b15891ecafb9c198245410013b30a68de7bfe (patch) | |
| tree | af9e16c2dca303c0d786432b7b287f88b2247a28 /hw | |
| parent | d10d69e39d921a7ca23458421195116ab4577c87 (diff) | |
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é <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/cirrus_vga.c | 1 | ||||
| -rw-r--r-- | hw/display/qxl.h | 1 | ||||
| -rw-r--r-- | hw/display/vga-isa-mm.c | 1 | ||||
| -rw-r--r-- | hw/display/vga-isa.c | 1 | ||||
| -rw-r--r-- | hw/display/vga-pci.c | 1 | ||||
| -rw-r--r-- | hw/display/vga.c | 1 | ||||
| -rw-r--r-- | hw/display/vga_int.h | 3 | ||||
| -rw-r--r-- | hw/display/virtio-vga.c | 1 | ||||
| -rw-r--r-- | hw/display/vmware_vga.c | 1 |
9 files changed, 2 insertions, 9 deletions
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index bc32bf1e39..138ae961b9 100644 --- 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 f6556adb73..8668a8e05a 100644 --- 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 51ccbccc41..68c4d6e23e 100644 --- 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 1af95562f2..26f69fd40a 100644 --- 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 7adb89fcb4..1674bd3581 100644 --- 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 ce95b40e5c..4163b532e0 100644 --- 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 ad34a1f048..fe23b81442 100644 --- 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 f9b017d86b..baa74ba82c 100644 --- 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 0e6673a911..bd3e8b3586 100644 --- 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" |