[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] s390x/kvm: include hw_accel.h instead of kvm.h
From: |
Vincent Palatin |
Subject: |
Re: [Qemu-devel] [PATCH] s390x/kvm: include hw_accel.h instead of kvm.h |
Date: |
Tue, 24 Jan 2017 13:41:32 +0100 |
On Tue, Jan 24, 2017 at 10:28 AM, Cornelia Huck
<address@hidden> wrote:
>
> 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 <address@hidden>
Acked-by: Vincent Palatin <address@hidden>
Sorry for the miss.
>
> ---
> target/s390x/kvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index 3ac29f92b3..5ad0acbc82 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"
> --
> 2.11.0
>