openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2016-03-09 12:19:37 +01:00 committed by Paolo Bonzini
parent daf015ef5a
commit 0137fdc094
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/misc/cbus.c
View File

@ -21,7 +21,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "hw/hw.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/devices.h" #include "hw/devices.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

4
include/hw/hw.h
View File

@ -2,7 +2,6 @@
#ifndef QEMU_HW_H #ifndef QEMU_HW_H
#define QEMU_HW_H #define QEMU_HW_H
#include "qemu-common.h"
#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H) #if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H)
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
@ -13,6 +12,7 @@
#include "block/aio.h" #include "block/aio.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h"
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
#if TARGET_LONG_BITS == 64 #if TARGET_LONG_BITS == 64
@ -41,6 +41,8 @@ typedef void QEMUResetHandler(void *opaque);
void qemu_register_reset(QEMUResetHandler *func, void *opaque); void qemu_register_reset(QEMUResetHandler *func, void *opaque);
void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); void qemu_unregister_reset(QEMUResetHandler *func, void *opaque);
void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
#ifdef NEED_CPU_H #ifdef NEED_CPU_H
#if TARGET_LONG_BITS == 64 #if TARGET_LONG_BITS == 64
#define VMSTATE_UINTTL_V(_f, _s, _v) \ #define VMSTATE_UINTTL_V(_f, _s, _v) \

4
include/qemu-common.h
View File

@ -303,10 +303,6 @@ int qemu_openpty_raw(int *aslave, char *pty_name);
sendto(sockfd, buf, len, flags, destaddr, addrlen) sendto(sockfd, buf, len, flags, destaddr, addrlen)
#endif #endif
/* Error handling. */
void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
struct ParallelIOArg { struct ParallelIOArg {
void *buffer; void *buffer;
int count; int count;