aboutsummaryrefslogtreecommitdiff
path: root/include/qemu-common.h
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-03-09 12:19:37 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-03-22 22:20:16 +0100
commit0137fdc0941cfe214e91c5c1444f3fcf6a5548b8 (patch)
tree61f27c71cf084015b3c0f54de6321dba697e2b8c /include/qemu-common.h
parentdaf015ef5ab7b67f4676fcbe74c57b1709f6cb70 (diff)
include/hw/hw.h: Don't include qemu-common.h
qemu-common.h should only be included by .c files. Its file comment explains why: "No header file should depend on qemu-common.h, as this would easily lead to circular header dependencies." hw/hw.h includes qemu-common.h, but its users generally need only hw_error() and qemu/module.h from it. Move the former to hw/hw.h, include the latter there, and drop the ill-advised include. hw/misc/cbus.c now misses hw_error(), so include hw/hw.h there. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qemu-common.h')
-rw-r--r--include/qemu-common.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h
index b8fbd9ea62..ba37968503 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -303,10 +303,6 @@ int qemu_openpty_raw(int *aslave, char *pty_name);
sendto(sockfd, buf, len, flags, destaddr, addrlen)
#endif
-/* Error handling. */
-
-void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
-
struct ParallelIOArg {
void *buffer;
int count;