Alexander Graf <ag...@csgraf.de> writes:
> We will need more than a single field for hvf going forward. To keep
> the global vcpu struct uncluttered, let's allocate a special hvf vcpu
> struct, similar to how hax does it.
>
> Signed-off-by: Alexander Graf <ag...@csgraf.de>
> Reviewed-by: Roman Bolshakov <r.bolsha...@yadro.com>
> Tested-by: Roman Bolshakov <r.bolsha...@yadro.com>
> ---
> accel/hvf/hvf-cpus.c | 8 +-
> include/hw/core/cpu.h | 3 +-
> include/sysemu/hvf_int.h | 4 +
> target/i386/hvf/hvf.c | 102 +++++++++---------
> target/i386/hvf/vmx.h | 24 +++--
> target/i386/hvf/x86.c | 28 ++---
> target/i386/hvf/x86_descr.c | 26 ++---
> target/i386/hvf/x86_emu.c | 62 +++++------
> target/i386/hvf/x86_mmu.c | 4 +-
> target/i386/hvf/x86_task.c | 12 +--
> target/i386/hvf/x86hvf.c | 210 ++++++++++++++++++------------------
> 11 files changed, 247 insertions(+), 236 deletions(-)
>
> diff --git a/accel/hvf/hvf-cpus.c b/accel/hvf/hvf-cpus.c
> index 60f6d76bf3..1b0c868944 100644
> --- a/accel/hvf/hvf-cpus.c
> +++ b/accel/hvf/hvf-cpus.c
> @@ -312,10 +312,12 @@ static void hvf_cpu_synchronize_pre_loadvm(CPUState
> *cpu)
>
> static void hvf_vcpu_destroy(CPUState *cpu)
> {
> - hv_return_t ret = hv_vcpu_destroy(cpu->hvf_fd);
> + hv_return_t ret = hv_vcpu_destroy(cpu->hvf->fd);
> assert_hvf_ok(ret);
>
> hvf_arch_vcpu_destroy(cpu);
> + free(cpu->hvf);
You should pair g_malloc0 with g_free.
> + cpu->hvf = NULL;
> }
>
> static void dummy_signal(int sig)
> @@ -326,6 +328,8 @@ static int hvf_init_vcpu(CPUState *cpu)
> {
> int r;
>
> + cpu->hvf = g_malloc0(sizeof(*cpu->hvf));
> +
Otherwise so far, so mechanical ;-)
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
--
Alex Bennée
