display: include dependencies explicitly

acpi-vga-stub.c pulls in vga_int.h
However that currently pulls in ui/console.h which
breaks e.g. on systems without pixman.
It's better to remove ui/console.h from vga_int.h
and directly include it where it's used.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221109222112.74519-1-mst@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
Reported-by: Frederic Bezies <fredbezies@gmail.com>
Reported-by: Laurent Vivier <lvivier@redhat.com>
Fixes: cfead31326 ("AcpiDevAmlIf interface to build VGA device descs")
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
index 692bec91de452070b1b8d6bce79baee394b06fe0..7d786653e870db5b8f9c7308debe4a38cb812133 100644 (file)
--- a/hw/display/ati_2d.c
+++ b/hw/display/ati_2d.c
@@ -12,6 +12,7 @@
 #include "ati_regs.h"
 #include "qemu/log.h"
 #include "ui/pixel_ops.h"
+#include "ui/console.h"
 
 /*
  * NOTE:

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index c1e719a405b30fef92055d8c6fcf85f5e82a6efb..6e8c747c46393a8de0f60f1e90e250ded75154ca 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -45,6 +45,7 @@
 #include "ui/pixel_ops.h"
 #include "cirrus_vga_internal.h"
 #include "qom/object.h"
+#include "ui/console.h"
 
 /*
  * TODO:

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 96144bd69060ed76820e0a5f980a227bf743b97c..84be51670ed8ad7b9942cb0ba5e0cbfaefa919d3 100644 (file)
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -31,6 +31,7 @@
 #include "hw/isa/isa.h"
 #include "cirrus_vga_internal.h"
 #include "qom/object.h"
+#include "ui/console.h"
 
 #define TYPE_ISA_CIRRUS_VGA "isa-cirrus-vga"
 OBJECT_DECLARE_SIMPLE_TYPE(ISACirrusVGAState, ISA_CIRRUS_VGA)

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 46abbc56534c06bce840a3055b9f6e26fd375781..2a5437d80370e049153cdf06d98bca117bc5e4bf 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -32,6 +32,7 @@
 #include "qemu/timer.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
+#include "ui/console.h"
 #include "qom/object.h"
 
 #define TYPE_ISA_VGA "isa-vga"

diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c
index 75dfcedea510cf9e83828536a0426749bd845122..cd2c46776dc8a6cf59cd0415119ec437ca047068 100644 (file)
--- a/hw/display/vga-mmio.c
+++ b/hw/display/vga-mmio.c
@@ -27,6 +27,7 @@
 #include "hw/sysbus.h"
 #include "hw/display/vga.h"
 #include "hw/qdev-properties.h"
+#include "ui/console.h"
 #include "vga_int.h"
 
 /*

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 9a91de7ed1c4480721b583a89dbf03a601bc5c6f..df23dbf3a09b00c21e6a25ce2a29297161cd7312 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -30,6 +30,7 @@
 #include "migration/vmstate.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
+#include "ui/console.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"

diff --git a/hw/display/vga.c b/hw/display/vga.c
index 50ecb1ad0297c3f503e691706c37c05b05759aba..0cb26a791bd1b0ea1834f5a871b95e44552aeee6 100644 (file)
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -31,6 +31,7 @@
 #include "vga_int.h"
 #include "vga_regs.h"
 #include "ui/pixel_ops.h"
+#include "ui/console.h"
 #include "qemu/timer.h"
 #include "hw/xen/xen.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 330406ad9c738752c94350908655a564215790dc..7cf0d11201acb37aba588836365d9b19e03f36dd 100644 (file)
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -27,7 +27,6 @@
 
 #include "exec/ioport.h"
 #include "exec/memory.h"
-#include "ui/console.h"
 
 #include "hw/display/bochs-vbe.h"
 #include "hw/acpi/acpi_aml_interface.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index cedbbde522ec056676d4436ecccdc640a4a453a3..53949d25396a9aacb9f907fbedab43bc2cf7ea4a 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -33,6 +33,7 @@
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
+#include "ui/console.h"
 
 #undef VERBOSE
 #define HW_RECT_ACCEL

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 6d4e6d9708dd826a826ce01efaef59a41fbf7eb3..688408e0481e413f03903f2a17854e96aff8ab38 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -132,6 +132,8 @@ typedef struct Visitor Visitor;
 typedef struct VMChangeStateEntry VMChangeStateEntry;
 typedef struct VMStateDescription VMStateDescription;
 typedef struct DumpState DumpState;
+typedef struct GraphicHwOps GraphicHwOps;
+typedef struct QEMUCursor QEMUCursor;
 
 /*
  * Pointer types