* [PATCH 0/2] hw/display: Trivial include cleanups
@ 2020-05-04 8:20 Philippe Mathieu-Daudé
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
2020-05-04 8:20 ` [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header Philippe Mathieu-Daudé
0 siblings, 2 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-04 8:20 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Michael Tokarev, Philippe Mathieu-Daudé,
Laurent Vivier, qemu-trivial, Gerd Hoffmann
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(-)
--
2.21.3
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] hw/display: Include local 'framebuffer.h'
2020-05-04 8:20 [PATCH 0/2] hw/display: Trivial include cleanups Philippe Mathieu-Daudé
@ 2020-05-04 8:20 ` Philippe Mathieu-Daudé
2020-05-04 9:50 ` Thomas Huth
` (2 more replies)
2020-05-04 8:20 ` [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header Philippe Mathieu-Daudé
1 sibling, 3 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-04 8:20 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Michael Tokarev, Philippe Mathieu-Daudé,
Laurent Vivier, qemu-trivial, Gerd Hoffmann
The "framebuffer.h" header is not an exported include.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/display/artist.c | 2 +-
hw/display/next-fb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 753dbb9a77..e1d5885fed 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -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)
diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c
index 2b726a10f8..b0513a8fba 100644
--- a/hw/display/next-fb.c
+++ b/hw/display/next-fb.c
@@ -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"
--
2.21.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
2020-05-04 8:20 [PATCH 0/2] hw/display: Trivial include cleanups Philippe Mathieu-Daudé
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
@ 2020-05-04 8:20 ` Philippe Mathieu-Daudé
2020-05-04 17:34 ` Richard Henderson
2020-05-04 18:37 ` Richard Henderson
1 sibling, 2 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-04 8:20 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, Michael Tokarev, Philippe Mathieu-Daudé,
Laurent Vivier, qemu-trivial, Gerd Hoffmann
To use the DEFINE_EDID_PROPERTIES() macro we need the
definitions from "hw/qdev-properties.h".
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/hw/display/edid.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h
index ff99dc0a05..23371ee82c 100644
--- a/include/hw/display/edid.h
+++ b/include/hw/display/edid.h
@@ -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 */
--
2.21.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
@ 2020-05-04 9:50 ` Thomas Huth
2020-05-04 17:31 ` Richard Henderson
2020-05-18 13:41 ` Gerd Hoffmann
2 siblings, 0 replies; 9+ messages in thread
From: Thomas Huth @ 2020-05-04 9:50 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-trivial, Laurent Vivier, Michael Tokarev, qemu-devel, Gerd Hoffmann
Am Mon, 4 May 2020 10:20:02 +0200
schrieb Philippe Mathieu-Daudé <f4bug@amsat.org>:
> The "framebuffer.h" header is not an exported include.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/display/artist.c | 2 +-
> hw/display/next-fb.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
2020-05-04 9:50 ` Thomas Huth
@ 2020-05-04 17:31 ` Richard Henderson
2020-05-18 13:41 ` Gerd Hoffmann
2 siblings, 0 replies; 9+ messages in thread
From: Richard Henderson @ 2020-05-04 17:31 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Thomas Huth, qemu-trivial, Michael Tokarev, Laurent Vivier,
Gerd Hoffmann
On 5/4/20 1:20 AM, Philippe Mathieu-Daudé wrote:
> The "framebuffer.h" header is not an exported include.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/display/artist.c | 2 +-
> hw/display/next-fb.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
2020-05-04 8:20 ` [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header Philippe Mathieu-Daudé
@ 2020-05-04 17:34 ` Richard Henderson
2020-05-04 18:37 ` Richard Henderson
1 sibling, 0 replies; 9+ messages in thread
From: Richard Henderson @ 2020-05-04 17:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Thomas Huth, qemu-trivial, Michael Tokarev, Laurent Vivier,
Gerd Hoffmann
On 5/4/20 1:20 AM, Philippe Mathieu-Daudé wrote:
> +++ b/include/hw/display/edid.h
> @@ -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~
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
2020-05-04 8:20 ` [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header Philippe Mathieu-Daudé
2020-05-04 17:34 ` Richard Henderson
@ 2020-05-04 18:37 ` Richard Henderson
2020-05-08 18:55 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 9+ messages in thread
From: Richard Henderson @ 2020-05-04 18:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Thomas Huth, qemu-trivial, Michael Tokarev, Laurent Vivier,
Gerd Hoffmann
On 5/4/20 1:20 AM, Philippe Mathieu-Daudé wrote:
> To use the DEFINE_EDID_PROPERTIES() macro we need the
> definitions from "hw/qdev-properties.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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~
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header
2020-05-04 18:37 ` Richard Henderson
@ 2020-05-08 18:55 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-08 18:55 UTC (permalink / raw)
To: Richard Henderson
Cc: Thomas Huth, Michael Tokarev, qemu-devel@nongnu.org Developers,
Laurent Vivier, QEMU Trivial, Gerd Hoffmann
On Mon, May 4, 2020 at 8:38 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 5/4/20 1:20 AM, Philippe Mathieu-Daudé wrote:
> > To use the DEFINE_EDID_PROPERTIES() macro we need the
> > definitions from "hw/qdev-properties.h".
> >
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > 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.
>
> r~
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] hw/display: Include local 'framebuffer.h'
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
2020-05-04 9:50 ` Thomas Huth
2020-05-04 17:31 ` Richard Henderson
@ 2020-05-18 13:41 ` Gerd Hoffmann
2 siblings, 0 replies; 9+ messages in thread
From: Gerd Hoffmann @ 2020-05-18 13:41 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Thomas Huth, qemu-trivial, Michael Tokarev, qemu-devel, Laurent Vivier
On Mon, May 04, 2020 at 10:20:02AM +0200, Philippe Mathieu-Daudé wrote:
> The "framebuffer.h" header is not an exported include.
Patch added to ui queue.
(patch 2/2 skipped, has unanswered quesions).
thanks,
Gerd
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/display/artist.c | 2 +-
> hw/display/next-fb.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 753dbb9a77..e1d5885fed 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -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)
> diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c
> index 2b726a10f8..b0513a8fba 100644
> --- a/hw/display/next-fb.c
> +++ b/hw/display/next-fb.c
> @@ -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"
>
> --
> 2.21.3
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-18 13:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 8:20 [PATCH 0/2] hw/display: Trivial include cleanups Philippe Mathieu-Daudé
2020-05-04 8:20 ` [PATCH 1/2] hw/display: Include local 'framebuffer.h' Philippe Mathieu-Daudé
2020-05-04 9:50 ` Thomas Huth
2020-05-04 17:31 ` Richard Henderson
2020-05-18 13:41 ` Gerd Hoffmann
2020-05-04 8:20 ` [PATCH 2/2] hw/display/edid: Add missing 'qdev-properties.h' header Philippe Mathieu-Daudé
2020-05-04 17:34 ` Richard Henderson
2020-05-04 18:37 ` Richard Henderson
2020-05-08 18:55 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.