falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: don't include hw/boards for linux-user 

As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code.
Include it conditionally, and drop the (now unnecessary) ifdef guards in
hw/boards.h

Reported-by: Andreas Färber <afaerber@suse.de>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Michael S. Tsirkin 2015-03-11 07:56:34 +01:00
parent 7927266183
commit 4485bd269c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exec.c
View File

@ -26,7 +26,9 @@
#include "cpu.h" #include "cpu.h"
#include "tcg.h" #include "tcg.h"
#include "hw/hw.h" #include "hw/hw.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/boards.h" #include "hw/boards.h"
#endif
#include "hw/qdev.h" #include "hw/qdev.h"
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

4
include/hw/boards.h
View File

@ -3,8 +3,6 @@
#ifndef HW_BOARDS_H #ifndef HW_BOARDS_H
#define HW_BOARDS_H #define HW_BOARDS_H
#if !defined(CONFIG_USER_ONLY)
#include "qemu/typedefs.h" #include "qemu/typedefs.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/accel.h" #include "sysemu/accel.h"
@ -158,5 +156,3 @@ struct MachineState {
}; };
#endif #endif
#endif