From: Markus Armbruster Date: Mon, 12 Aug 2019 05:23:47 +0000 (+0200) Subject: Include qom/object.h slightly less X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7febd959740d45c0fc07ce63d834815483afaa0;p=qemu.git Include qom/object.h slightly less 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190812052359.30071-18-armbru@redhat.com> --- 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