diff options
| author | Reinoud Zandijk <reinoud@NetBSD.org> | 2021-04-02 22:25:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-04 14:15:34 +0200 |
| commit | b9bc6169dee36186237f898b41f48956f59a01b1 (patch) | |
| tree | fd1af237958448f972cbeb10871ceca47629b1ea | |
| parent | fdc8635e870b7396a8e2fe4fadfdbec0060d5ef4 (diff) | |
| download | qemu-b9bc6169dee36186237f898b41f48956f59a01b1.zip qemu-b9bc6169dee36186237f898b41f48956f59a01b1.tar.gz qemu-b9bc6169dee36186237f898b41f48956f59a01b1.tar.bz2 | |
Add NVMM accelerator: acceleration enlightenments
Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>
Message-Id: <20210402202535.11550-4-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/sysemu/hw_accel.h | 1 | ||||
| -rw-r--r-- | include/sysemu/nvmm.h | 26 | ||||
| -rw-r--r-- | target/i386/helper.c | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h index 61672f9..01b5ebf 100644 --- a/include/sysemu/hw_accel.h +++ b/include/sysemu/hw_accel.h @@ -16,6 +16,7 @@ #include "sysemu/kvm.h" #include "sysemu/hvf.h" #include "sysemu/whpx.h" +#include "sysemu/nvmm.h" void cpu_synchronize_state(CPUState *cpu); void cpu_synchronize_post_reset(CPUState *cpu); diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h new file mode 100644 index 0000000..6d21659 --- /dev/null +++ b/include/sysemu/nvmm.h @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved. + * + * NetBSD Virtual Machine Monitor (NVMM) accelerator support. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_NVMM_H +#define QEMU_NVMM_H + +#include "config-host.h" +#include "qemu-common.h" + +#ifdef CONFIG_NVMM + +int nvmm_enabled(void); + +#else /* CONFIG_NVMM */ + +#define nvmm_enabled() (0) + +#endif /* CONFIG_NVMM */ + +#endif /* CONFIG_NVMM */ diff --git a/target/i386/helper.c b/target/i386/helper.c index 618ad1c..8c180b5 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -495,7 +495,7 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) X86CPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env); - if (kvm_enabled() || whpx_enabled()) { + if (kvm_enabled() || whpx_enabled() || nvmm_enabled()) { env->tpr_access_type = access; cpu_interrupt(cs, CPU_INTERRUPT_TPR); |