Reviewed-by: Claudio Fontana <cfont...@suse.de>
On 6/25/20 12:58 AM, Roman Bolshakov wrote:
> Cc: Cameron Esfahani <di...@apple.com>
> Signed-off-by: Roman Bolshakov <r.bolsha...@yadro.com>
> ---
> cpus.c | 12 ------------
> include/sysemu/hw_accel.h | 10 ++++++++++
> 2 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 7317ae06b9..26709677d3 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -1017,10 +1017,6 @@ void cpu_synchronize_all_states(void)
>
> CPU_FOREACH(cpu) {
> cpu_synchronize_state(cpu);
> - /* TODO: move to cpu_synchronize_state() */
> - if (hvf_enabled()) {
> - hvf_cpu_synchronize_state(cpu);
> - }
> }
> }
>
> @@ -1030,10 +1026,6 @@ void cpu_synchronize_all_post_reset(void)
>
> CPU_FOREACH(cpu) {
> cpu_synchronize_post_reset(cpu);
> - /* TODO: move to cpu_synchronize_post_reset() */
> - if (hvf_enabled()) {
> - hvf_cpu_synchronize_post_reset(cpu);
> - }
> }
> }
>
> @@ -1043,10 +1035,6 @@ void cpu_synchronize_all_post_init(void)
>
> CPU_FOREACH(cpu) {
> cpu_synchronize_post_init(cpu);
> - /* TODO: move to cpu_synchronize_post_init() */
> - if (hvf_enabled()) {
> - hvf_cpu_synchronize_post_init(cpu);
> - }
> }
> }
>
> diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h
> index 0ec2372477..80bce75921 100644
> --- a/include/sysemu/hw_accel.h
> +++ b/include/sysemu/hw_accel.h
> @@ -14,6 +14,7 @@
> #include "hw/core/cpu.h"
> #include "sysemu/hax.h"
> #include "sysemu/kvm.h"
> +#include "sysemu/hvf.h"
> #include "sysemu/whpx.h"
>
> static inline void cpu_synchronize_state(CPUState *cpu)
> @@ -24,6 +25,9 @@ static inline void cpu_synchronize_state(CPUState *cpu)
> if (hax_enabled()) {
> hax_cpu_synchronize_state(cpu);
> }
> + if (hvf_enabled()) {
> + hvf_cpu_synchronize_state(cpu);
> + }
> if (whpx_enabled()) {
> whpx_cpu_synchronize_state(cpu);
> }
> @@ -37,6 +41,9 @@ static inline void cpu_synchronize_post_reset(CPUState *cpu)
> if (hax_enabled()) {
> hax_cpu_synchronize_post_reset(cpu);
> }
> + if (hvf_enabled()) {
> + hvf_cpu_synchronize_post_reset(cpu);
> + }
> if (whpx_enabled()) {
> whpx_cpu_synchronize_post_reset(cpu);
> }
> @@ -50,6 +57,9 @@ static inline void cpu_synchronize_post_init(CPUState *cpu)
> if (hax_enabled()) {
> hax_cpu_synchronize_post_init(cpu);
> }
> + if (hvf_enabled()) {
> + hvf_cpu_synchronize_post_init(cpu);
> + }
> if (whpx_enabled()) {
> whpx_cpu_synchronize_post_init(cpu);
> }
>
