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 <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-18-armbru@redhat.com>

diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h
index 7948bd2c40f8d26e7b67b70f0877fb148079a0e2..ff99dc0a052b9f5e98f4a349ec2ede6545c2632c 100644 (file)
--- 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 8e18358e6ac44ef91d7963343091be30fa9eae4f..8079b911fa784bf3e19bcfee68467e7af5b43f50 100644 (file)
--- 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