display: include dependencies explicitly
PATCH 1/1 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.
--- hw/display/vga_int.h | 1 - include/qemu/typedefs.h | 2 ++ hw/display/ati_2d.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/cirrus_vga_isa.c | 1 + hw/display/vga-isa.c | 1 + hw/display/vga-mmio.c | 1 + hw/display/vga-pci.c | 1 + hw/display/vga.c | 1 + hw/display/vmware_vga.c | 1 + 10 files changed, 10 insertions(+), 1 deletion(-)
hw/display/vga_int.h +0 -1
@@ -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"
include/qemu/typedefs.h +2 -0
@@ -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
hw/display/ati_2d.c +1 -0
@@ -12,6 +12,7 @@#include "ati_regs.h" #include "qemu/log.h" #include "ui/pixel_ops.h" +#include "ui/console.h" /* * NOTE:
hw/display/cirrus_vga.c +1 -0
@@ -45,6 +45,7 @@#include "ui/pixel_ops.h" #include "cirrus_vga_internal.h" #include "qom/object.h" +#include "ui/console.h" /* * TODO:
hw/display/cirrus_vga_isa.c +1 -0
@@ -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 )
hw/display/vga-isa.c +1 -0
@@ -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"
hw/display/vga-mmio.c +1 -0
@@ -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" /*
hw/display/vga-pci.c +1 -0
@@ -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"
hw/display/vga.c +1 -0
@@ -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"
hw/display/vmware_vga.c +1 -0
@@ -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
Signature · 1 line
MST
Quoted 6 lines · Michael S. Tsirkin
acpi-vga-stub.cpulls invga_int.h
However that currently pulls inui/console.hwhich breaks e.g. on systems without pixman. It's better to removeui/console.hfromvga_int.hand directly include it where it's used.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1308
Quoted 31 lines
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/display/vga_int.h | 1 - include/qemu/typedefs.h | 2 ++ hw/display/ati_2d.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/cirrus_vga_isa.c | 1 + hw/display/vga-isa.c | 1 + hw/display/vga-mmio.c | 1 + hw/display/vga-pci.c | 1 + hw/display/vga.c | 1 + hw/display/vmware_vga.c | 1 + 10 files changed, 10 insertions(+), 1 deletion(-)hw/display/vga_int.h +0
-1@@ -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" include/qemu/typedefs.h +0
-0
include/qemu/typedefs.h typedef struct Visitor Visitor; · line 136
Quoted 5 lines
include/qemu/typedefs.h +2
-0@@ -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 ;
Besides the "Please keep this list in case-insensitive alphabetical order." in this file header,
Quoted 98 lines
include/qemu/typedefs.h +0
-0/* * Pointer types hw/display/ati_2d.c +1
-0@@ -12,6 +12,7 @@#include "ati_regs.h" #include "qemu/log.h" #include "ui/pixel_ops.h" +#include "ui/console.h" /* * NOTE: hw/display/cirrus_vga.c +1
-0@@ -45,6 +45,7 @@#include "ui/pixel_ops.h" #include "cirrus_vga_internal.h" #include "qom/object.h" +#include "ui/console.h" /* * TODO: hw/display/cirrus_vga_isa.c +1
-0@@ -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 )hw/display/vga-isa.c +1
-0@@ -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"hw/display/vga-mmio.c +1
-0@@ -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" /* hw/display/vga-pci.c +1
-0@@ -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" hw/display/vga.c +1
-0@@ -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" hw/display/vmware_vga.c +1
-0@@ -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
Quoted 7 lines · Michael S. Tsirkin
acpi-vga-stub.cpulls invga_int.h
However that currently pulls inui/console.hwhich breaks e.g. on systems without pixman. It's better to removeui/console.hfromvga_int.hand directly include it where it's used.Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 134 lines
--- hw/display/vga_int.h | 1 - include/qemu/typedefs.h | 2 ++ hw/display/ati_2d.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/cirrus_vga_isa.c | 1 + hw/display/vga-isa.c | 1 + hw/display/vga-mmio.c | 1 + hw/display/vga-pci.c | 1 + hw/display/vga.c | 1 + hw/display/vmware_vga.c | 1 + 10 files changed, 10 insertions(+), 1 deletion(-)hw/display/vga_int.h +0
-1@@ -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" include/qemu/typedefs.h +2
-0@@ -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 hw/display/ati_2d.c +1
-0@@ -12,6 +12,7 @@#include "ati_regs.h" #include "qemu/log.h" #include "ui/pixel_ops.h" +#include "ui/console.h" /* * NOTE: hw/display/cirrus_vga.c +1
-0@@ -45,6 +45,7 @@#include "ui/pixel_ops.h" #include "cirrus_vga_internal.h" #include "qom/object.h" +#include "ui/console.h" /* * TODO: hw/display/cirrus_vga_isa.c +1
-0@@ -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 )hw/display/vga-isa.c +1
-0@@ -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"hw/display/vga-mmio.c +1
-0@@ -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" /* hw/display/vga-pci.c +1
-0@@ -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" hw/display/vga.c +1
-0@@ -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" hw/display/vmware_vga.c +1
-0@@ -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