diff mbox series

[2/2] hw/display/edid: Add missing 'qdev-properties.h' header

Message ID 20200504082003.16298-3-f4bug@amsat.org
State New
Headers show
Series hw/display: Trivial include cleanups | expand

Commit Message

Philippe Mathieu-Daudé May 4, 2020, 8:20 a.m. UTC 
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(+)

Comments

Richard Henderson May 4, 2020, 5:34 p.m. UTC | #1 
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~
Richard Henderson May 4, 2020, 6:37 p.m. UTC | #2 
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~
Philippe Mathieu-Daudé May 8, 2020, 6:55 p.m. UTC | #3 
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~
>
diff mbox series

Patch

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 */