hw/display: Trivial include cleanups
cover hw/display: Trivial include cleanups
Some 'display' patches worth salvaging while doing housekeeping.
Philippe Mathieu-Daudé (2):
hw/display: Include local 'framebuffer.h' hw/display/edid: Add missing 'qdev-properties.h' header
include/hw/display/edid.h | 1 + hw/display/artist.c | 2 +- hw/display/next-fb.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.21.3
PATCH 1/2 hw/display: Include local 'framebuffer.h'
The "framebuffer.h" header is not an exported include.
--- hw/display/artist.c | 2 +- hw/display/next-fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
hw/display/artist.c +1 -1
@@ -21,7 +21,7 @@#include "migration/vmstate.h" #include "ui/console.h" #include "trace.h" -#include "hw/display/framebuffer.h" +#include "framebuffer.h" #define TYPE_ARTIST "artist"#define ARTIST (obj) OBJECT_CHECK(ARTISTState, (obj), TYPE_ARTIST)
hw/display/next-fb.c +1 -1
@@ -27,7 +27,7 @@#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/display/framebuffer.h" +#include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/m68k/next-cube.h"
Signature · 1 line
2.21.3
Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
Am Mon, 4 May 2020 10:20:02 +0200
schrieb Philippe Mathieu-Daudé <[email protected]>:
Quoted 7 lines
The "
framebuffer.h" header is not an exported include.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/display/artist.c | 2 +- hw/display/next-fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
The "
framebuffer.h" header is not an exported include.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/display/artist.c | 2 +- hw/display/next-fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
r~
Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
In reply to Philippe Mathieu-DaudéQuoted 1 line · Philippe Mathieu-Daudé
The "
framebuffer.h" header is not an exported include.
Patch added to ui queue.
(patch 2/2 skipped, has unanswered quesions).
thanks,
Gerd
Quoted 36 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/display/artist.c | 2 +- hw/display/next-fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)hw/display/artist.c +1
-1@@ -21,7 +21,7 @@#include "migration/vmstate.h" #include "ui/console.h" #include "trace.h" -#include "hw/display/framebuffer.h" +#include "framebuffer.h" #define TYPE_ARTIST "artist"#define ARTIST (obj) OBJECT_CHECK(ARTISTState, (obj), TYPE_ARTIST)hw/display/next-fb.c +1
-1@@ -27,7 +27,7 @@#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/display/framebuffer.h" +#include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/m68k/next-cube.h" Signature · 1 line
2.21.3
PATCH 2/2 hw/display/edid: Add missing 'qdev-properties.h' header
In reply to Philippe Mathieu-DaudéTo use the DEFINE_EDID_PROPERTIES() macro we need the definitions from "hw/qdev-properties.h".
--- include/hw/display/edid.h | 1 + 1 file changed, 1 insertion(+)
include/hw/display/edid.h +1 -0
@@ -2,6 +2,7 @@#define EDID_H #include "qom/object.h" +#include "hw/qdev-properties.h" typedef struct qemu_edid_info { const char *vendor; /* http://www.uefi.org/pnp_id_list */
Signature · 1 line
2.21.3
Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
include/hw/display/edid.h line 5
Quoted 6 lines · Philippe Mathieu-Daudé
+++
b/include/hw/display/edid.hinclude/hw/display/edid.h +1
-0@@ -2,6 +2,7 @@#define EDID_H #include "qom/object.h" +#include "hw/qdev-properties.h"
So, are you intending to remove this include from other c files?
r~
Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
To use the
DEFINE_EDID_PROPERTIES()macro we need the definitions from "hw/qdev-properties.h".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/display/edid.h | 1 + 1 file changed, 1 insertion(+)
Does this not currently build? I'm not sure what you're fixing.
r~
Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
Quoted 11 lines · Richard Henderson
Quoted 7 lines · Philippe Mathieu-Daudé
To use the
DEFINE_EDID_PROPERTIES()macro we need the definitions from "hw/qdev-properties.h".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/display/edid.h | 1 + 1 file changed, 1 insertion(+)Does this not currently build? I'm not sure what you're fixing.
Because when trying to use this header once included, I get when building:
include/hw/display/edid.h:24:5: error: implicit declaration of function ‘DEFINE_PROP_UINT32’ [-Werror=implicit-function-declaration]
24 | DEFINE_PROP_UINT32("xres", _state, _edid_info.prefx, 0), \
| ^~~~~~~~~~~~~~~~~~Then I've to grep for this macro and figure out I need to include "hw/qdev-properties.h".
I am expecting a header providing a macro to also include the pre-requisites, so I fixed in case someone else run into the same problem.
Does it make sense? I can reword the patch description to better explain.
Quoted 3 lines
r~