summaryrefslogtreecommitdiffstats
path: root/hw
authorAvi Kivity <[email protected]>2011-06-28 12:06:37 (GMT)
committer Avi Kivity <[email protected]>2011-06-28 12:06:37 (GMT)
commita02219aa4d370256b5e29bc5b2ae38d4a5507a1a (patch) (side-by-side diff)
tree9cb755623f7a6e2778d7bc638f75675109380594 /hw
parent6ecc9d4c1e375b15acc3cf3b0314ecce8548be74 (diff)
parent2b41f10e186ccb4f0058815161586f8d6d006ea3 (diff)
downloadqemu-kvm-a02219aa4d370256b5e29bc5b2ae38d4a5507a1a.zip
qemu-kvm-a02219aa4d370256b5e29bc5b2ae38d4a5507a1a.tar.gz
qemu-kvm-a02219aa4d370256b5e29bc5b2ae38d4a5507a1a.tar.bz2
Merge commit '2b41f10e186ccb4f0058815161586f8d6d006ea3' into upstream-merge
* commit '2b41f10e186ccb4f0058815161586f8d6d006ea3': Remove exec-all.h include directives Move cpu_has_work and cpu_pc_from_tb to cpu.h exec.h: fix coding style and change cpu_has_work to return bool Conflicts: exec.c Signed-off-by: Avi Kivity <[email protected]>
Diffstat (limited to 'hw') (more/less context) (ignore whitespace changes)
-rw-r--r--hw/sh7750.c1
-rw-r--r--hw/spapr_hcall.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/hw/sh7750.c b/hw/sh7750.c
index 19d5bf8..4f279e7 100644
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -29,7 +29,6 @@
#include "sh7750_regs.h"
#include "sh7750_regnames.h"
#include "sh_intc.h"
-#include "exec-all.h"
#include "cpu.h"
#define NB_DEVICES 4
diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 43c441d..84da8fc 100644
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -3,7 +3,6 @@
#include "qemu-char.h"
#include "sysemu.h"
#include "qemu-char.h"
-#include "exec-all.h"
#include "exec.h"
#include "helper_regs.h"
#include "hw/spapr.h"