[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/con
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h" |
Date: |
Mon, 18 Dec 2017 00:28:00 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
since The VGACommonState struct has a GraphicHwOps *hw_ops member,
then remove the now unnecessary includes.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
hw/display/cirrus_vga.c | 1 -
hw/display/qxl.h | 1 -
hw/display/vga-isa-mm.c | 1 -
hw/display/vga-isa.c | 1 -
hw/display/vga-pci.c | 1 -
hw/display/vga.c | 1 -
hw/display/vga_int.h | 3 ++-
hw/display/virtio-vga.c | 1 -
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"
--
2.11.0
- [Qemu-trivial] [PULL 00/61] Trivial patches for 2017-12-18, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 05/61] qht: fix kernel-doc markup in qht.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 39/61] hw/input/vmmouse: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 30/61] block: remove "qemu/osdep.h" from header file, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 59/61] i386/pc: move vmport.c to hw/i386/, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h",
Michael Tokarev <=
- [Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 15/61] MAINTAINERS: add "hw/registerfields.h" in Register API entry, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 01/61] Remove empty statements, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 13/61] accel/tcg/cpu-exec-common.c: Remove unnecessary include of memory-internal.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 07/61] mmap(2) returns MAP_FAILED, not NULL, on failure, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimplemented" sysbus device, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 47/61] hw/tpm: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 04/61] translate-all: fix 'consisits' typo in comment, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 40/61] hw/misc/pvpanic: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code commented out), Michael Tokarev, 2017/12/17