[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/c
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/console.h" |
Date: |
Tue, 17 Oct 2017 13:44:20 -0300 |
since The VGACommonState struct has a GraphicHwOps *hw_ops member,
then remove the now unnecessary includes.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/display/qxl.h | 1 -
hw/display/vga_int.h | 3 ++-
hw/display/cirrus_vga.c | 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/virtio-vga.c | 1 -
hw/display/vmware_vga.c | 1 -
9 files changed, 2 insertions(+), 9 deletions(-)
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_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/cirrus_vga.c b/hw/display/cirrus_vga.c
index b4d579857a..cde3f17ebd 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/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 35696b6fdd..22fd069ad2 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/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 cdc3fed6ca..06d0adc590 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.15.0.rc0
- [Qemu-devel] [PATCH v3 29/42] hw/virtio-balloon: remove old i386 dependency, (continued)
- [Qemu-devel] [PATCH v3 29/42] hw/virtio-balloon: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 30/42] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 31/42] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 32/42] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 33/42] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 34/42] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 35/42] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h", Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/console.h",
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 37/42] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h", Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 38/42] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 39/42] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h", Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 41/42] i386/pc: move vmmouse.c to hw/i386/, Philippe Mathieu-Daudé, 2017/10/17
- [Qemu-devel] [PATCH v3 42/42] misc: drop old i386 dependency, Philippe Mathieu-Daudé, 2017/10/17