Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu

Adapt header include paths.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-12-23 00:39:34 +01:00
commit 501a7ce727
1126 changed files with 3773 additions and 4070 deletions

View file

@ -27,9 +27,9 @@
#define CPUArchState struct CPUAlphaState
#include "cpu-defs.h"
#include "exec/cpu-defs.h"
#include "softfloat.h"
#include "fpu/softfloat.h"
#define TARGET_HAS_ICE 1
@ -294,7 +294,7 @@ struct CPUAlphaState {
#define cpu_gen_code cpu_alpha_gen_code
#define cpu_signal_handler cpu_alpha_signal_handler
#include "cpu-all.h"
#include "exec/cpu-all.h"
#include "cpu-qom.h"
enum {
@ -532,7 +532,7 @@ static inline bool cpu_has_work(CPUState *cpu)
| CPU_INTERRUPT_MCHK);
}
#include "exec-all.h"
#include "exec/exec-all.h"
static inline void cpu_pc_from_tb(CPUAlphaState *env, TranslationBlock *tb)
{