diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2017-01-24 10:18:02 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2017-01-24 15:45:45 +0100 |
| commit | 8195d8992b348d675072187501ff2027bff7707b (patch) | |
| tree | 21ae29e0ffd7a8b5ad5b1b47e616417d16dd2f77 | |
| parent | 48cef39bf39846ce4aaf79d4a2ae620373b3e181 (diff) | |
| download | qemu-8195d8992b348d675072187501ff2027bff7707b.zip qemu-8195d8992b348d675072187501ff2027bff7707b.tar.gz qemu-8195d8992b348d675072187501ff2027bff7707b.tar.bz2 | |
s390x/kvm: include hw_accel.h instead of kvm.h
Commit b394662 ("kvm: move cpu synchronization code") switched
to hw_accel.h instead of kvm.h, but missed s390x, resulting in
CC s390x-softmmu/target/s390x/kvm.o
/home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘kvm_sclp_service_call’:
/home/cohuck/git/qemu/target/s390x/kvm.c:1034:5: error: implicit declaration of function ‘cpu_synchronize_state’ [-Werror=implicit-function-declaration]
cpu_synchronize_state(CPU(cpu));
^
/home/cohuck/git/qemu/target/s390x/kvm.c:1034:5: error: nested extern declaration of ‘cpu_synchronize_state’ [-Werror=nested-externs]
/home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘sigp_initial_cpu_reset’:
/home/cohuck/git/qemu/target/s390x/kvm.c:1628:5: error: implicit declaration of function ‘cpu_synchronize_post_reset’ [-Werror=implicit-function-declaration]
cpu_synchronize_post_reset(cs);
^
/home/cohuck/git/qemu/target/s390x/kvm.c:1628:5: error: nested extern declaration of ‘cpu_synchronize_post_reset’ [-Werror=nested-externs]
/home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘sigp_set_prefix’:
/home/cohuck/git/qemu/target/s390x/kvm.c:1665:5: error: implicit declaration of function ‘cpu_synchronize_post_init’ [-Werror=implicit-function-declaration]
cpu_synchronize_post_init(cs);
^
/home/cohuck/git/qemu/target/s390x/kvm.c:1665:5: error: nested extern declaration of ‘cpu_synchronize_post_init’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
/home/cohuck/git/qemu/rules.mak:64: recipe for target 'target/s390x/kvm.o' failed
Fix this.
Fixes: b394662 ("kvm: move cpu synchronization code")
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | target/s390x/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 3ac29f9..5ad0acb 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -32,7 +32,7 @@ #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "sysemu/kvm.h" +#include "sysemu/hw_accel.h" #include "hw/hw.h" #include "sysemu/device_tree.h" #include "qapi/qmp/qjson.h" |