mirror of https://gitlab.com/qemu-project/qemu
nvmm: Fix support for stable version
NVMM user version 1 is the version being shipped with netbsd-9, which is the most recent stable branch of NetBSD. This makes it possible to use the NVMM accelerator on the most recent NetBSD release, 9.2, which lacks nvmm_cpu_stop. (CC'ing maintainers) Signed-off-by: Nia Alarie <nia@NetBSD.org> Reviewed-by: Kamil Rytarowski <kamil@netbsd.org> Message-Id: <YWblCe2J8GwCaV9U@homeworld.netbsd.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6a23f8190f
commit
0cc4965049
|
@ -323,9 +323,7 @@ if not get_option('hax').disabled()
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
if targetos == 'netbsd'
|
if targetos == 'netbsd'
|
||||||
if cc.has_header_symbol('nvmm.h', 'nvmm_cpu_stop', required: get_option('nvmm'))
|
nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
|
||||||
nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
|
|
||||||
endif
|
|
||||||
if nvmm.found()
|
if nvmm.found()
|
||||||
accelerators += 'CONFIG_NVMM'
|
accelerators += 'CONFIG_NVMM'
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -750,7 +750,11 @@ nvmm_vcpu_loop(CPUState *cpu)
|
||||||
nvmm_vcpu_pre_run(cpu);
|
nvmm_vcpu_pre_run(cpu);
|
||||||
|
|
||||||
if (qatomic_read(&cpu->exit_request)) {
|
if (qatomic_read(&cpu->exit_request)) {
|
||||||
|
#if NVMM_USER_VERSION >= 2
|
||||||
nvmm_vcpu_stop(vcpu);
|
nvmm_vcpu_stop(vcpu);
|
||||||
|
#else
|
||||||
|
qemu_cpu_kick_self();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read exit_request before the kernel reads the immediate exit flag */
|
/* Read exit_request before the kernel reads the immediate exit flag */
|
||||||
|
@ -767,6 +771,7 @@ nvmm_vcpu_loop(CPUState *cpu)
|
||||||
switch (exit->reason) {
|
switch (exit->reason) {
|
||||||
case NVMM_VCPU_EXIT_NONE:
|
case NVMM_VCPU_EXIT_NONE:
|
||||||
break;
|
break;
|
||||||
|
#if NVMM_USER_VERSION >= 2
|
||||||
case NVMM_VCPU_EXIT_STOPPED:
|
case NVMM_VCPU_EXIT_STOPPED:
|
||||||
/*
|
/*
|
||||||
* The kernel cleared the immediate exit flag; cpu->exit_request
|
* The kernel cleared the immediate exit flag; cpu->exit_request
|
||||||
|
@ -775,6 +780,7 @@ nvmm_vcpu_loop(CPUState *cpu)
|
||||||
smp_wmb();
|
smp_wmb();
|
||||||
qcpu->stop = true;
|
qcpu->stop = true;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case NVMM_VCPU_EXIT_MEMORY:
|
case NVMM_VCPU_EXIT_MEMORY:
|
||||||
ret = nvmm_handle_mem(mach, vcpu);
|
ret = nvmm_handle_mem(mach, vcpu);
|
||||||
break;
|
break;
|
||||||
|
@ -888,8 +894,12 @@ nvmm_ipi_signal(int sigcpu)
|
||||||
{
|
{
|
||||||
if (current_cpu) {
|
if (current_cpu) {
|
||||||
struct qemu_vcpu *qcpu = get_qemu_vcpu(current_cpu);
|
struct qemu_vcpu *qcpu = get_qemu_vcpu(current_cpu);
|
||||||
|
#if NVMM_USER_VERSION >= 2
|
||||||
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
struct nvmm_vcpu *vcpu = &qcpu->vcpu;
|
||||||
nvmm_vcpu_stop(vcpu);
|
nvmm_vcpu_stop(vcpu);
|
||||||
|
#else
|
||||||
|
qcpu->stop = true;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue