On 7/26/19 2:05 PM, Markus Armbruster wrote:
> hw/hw.h used to include headers hardware emulation "usually" needs.
> The previous commits removed all but one of them, to good effect.
> Only qom/object.h is left. Remove that one, too.
>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> include/hw/display/edid.h | 2 +-
> include/hw/hw.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h
> index 7948bd2c40..ff99dc0a05 100644
> --- a/include/hw/display/edid.h
> +++ b/include/hw/display/edid.h
> @@ -1,7 +1,7 @@
> #ifndef EDID_H
> #define EDID_H
>
> -#include "hw/hw.h"
> +#include "qom/object.h"
>
> typedef struct qemu_edid_info {
> const char *vendor; /* http://www.uefi.org/pnp_id_list */
> diff --git a/include/hw/hw.h b/include/hw/hw.h
> index 8e18358e6a..8079b911fa 100644
> --- a/include/hw/hw.h
> +++ b/include/hw/hw.h
> @@ -6,8 +6,6 @@
> #error Cannot include hw/hw.h from user emulation
> #endif
>
> -#include "qom/object.h"
> -
> void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
>
> #endif
>
