| Message ID | 20200206115731.13552-2-n54@gmx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Implements the NetBSD Virtual Machine Monitor accelerator | expand |
Tested-by: Jared McNeill <jmcneill@invisible.ca> On Thu, 6 Feb 2020, Kamil Rytarowski wrote: > From: Maxime Villard <max@m00nbsd.net> > > Adds support for the NetBSD Virtual Machine Monitor (NVMM) stubs and > introduces the nvmm.h sysemu API for managing the vcpu scheduling and > management. > > Signed-off-by: Maxime Villard <max@m00nbsd.net> > Signed-off-by: Kamil Rytarowski <n54@gmx.com> > Reviewed-by: Sergio Lopez <slp@redhat.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > accel/stubs/Makefile.objs | 1 + > accel/stubs/nvmm-stub.c | 43 +++++++++++++++++++++++++++++++++++++++ > include/sysemu/nvmm.h | 35 +++++++++++++++++++++++++++++++ > 3 files changed, 79 insertions(+) > create mode 100644 accel/stubs/nvmm-stub.c > create mode 100644 include/sysemu/nvmm.h > > diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs > index 3894caf95d..09f2d3e1dd 100644 > --- a/accel/stubs/Makefile.objs > +++ b/accel/stubs/Makefile.objs > @@ -1,5 +1,6 @@ > obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o > obj-$(call lnot,$(CONFIG_HVF)) += hvf-stub.o > obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o > +obj-$(call lnot,$(CONFIG_NVMM)) += nvmm-stub.o > obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o > obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o > diff --git a/accel/stubs/nvmm-stub.c b/accel/stubs/nvmm-stub.c > new file mode 100644 > index 0000000000..c2208b84a3 > --- /dev/null > +++ b/accel/stubs/nvmm-stub.c > @@ -0,0 +1,43 @@ > +/* > + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved. > + * > + * NetBSD Virtual Machine Monitor (NVMM) accelerator stub. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "qemu-common.h" > +#include "cpu.h" > +#include "sysemu/nvmm.h" > + > +int nvmm_init_vcpu(CPUState *cpu) > +{ > + return -1; > +} > + > +int nvmm_vcpu_exec(CPUState *cpu) > +{ > + return -1; > +} > + > +void nvmm_destroy_vcpu(CPUState *cpu) > +{ > +} > + > +void nvmm_cpu_synchronize_state(CPUState *cpu) > +{ > +} > + > +void nvmm_cpu_synchronize_post_reset(CPUState *cpu) > +{ > +} > + > +void nvmm_cpu_synchronize_post_init(CPUState *cpu) > +{ > +} > + > +void nvmm_cpu_synchronize_pre_loadvm(CPUState *cpu) > +{ > +} > diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h > new file mode 100644 > index 0000000000..10496f3980 > --- /dev/null > +++ b/include/sysemu/nvmm.h > @@ -0,0 +1,35 @@ > +/* > + * 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" > + > +int nvmm_init_vcpu(CPUState *); > +int nvmm_vcpu_exec(CPUState *); > +void nvmm_destroy_vcpu(CPUState *); > + > +void nvmm_cpu_synchronize_state(CPUState *); > +void nvmm_cpu_synchronize_post_reset(CPUState *); > +void nvmm_cpu_synchronize_post_init(CPUState *); > +void nvmm_cpu_synchronize_pre_loadvm(CPUState *); > + > +#ifdef CONFIG_NVMM > + > +int nvmm_enabled(void); > + > +#else /* CONFIG_NVMM */ > + > +#define nvmm_enabled() (0) > + > +#endif /* CONFIG_NVMM */ > + > +#endif /* CONFIG_NVMM */ > -- > 2.25.0 > >
diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs index 3894caf95d..09f2d3e1dd 100644 --- a/accel/stubs/Makefile.objs +++ b/accel/stubs/Makefile.objs @@ -1,5 +1,6 @@ obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o obj-$(call lnot,$(CONFIG_HVF)) += hvf-stub.o obj-$(call lnot,$(CONFIG_WHPX)) += whpx-stub.o +obj-$(call lnot,$(CONFIG_NVMM)) += nvmm-stub.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o diff --git a/accel/stubs/nvmm-stub.c b/accel/stubs/nvmm-stub.c new file mode 100644 index 0000000000..c2208b84a3 --- /dev/null +++ b/accel/stubs/nvmm-stub.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved. + * + * NetBSD Virtual Machine Monitor (NVMM) accelerator stub. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "cpu.h" +#include "sysemu/nvmm.h" + +int nvmm_init_vcpu(CPUState *cpu) +{ + return -1; +} + +int nvmm_vcpu_exec(CPUState *cpu) +{ + return -1; +} + +void nvmm_destroy_vcpu(CPUState *cpu) +{ +} + +void nvmm_cpu_synchronize_state(CPUState *cpu) +{ +} + +void nvmm_cpu_synchronize_post_reset(CPUState *cpu) +{ +} + +void nvmm_cpu_synchronize_post_init(CPUState *cpu) +{ +} + +void nvmm_cpu_synchronize_pre_loadvm(CPUState *cpu) +{ +} diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h new file mode 100644 index 0000000000..10496f3980 --- /dev/null +++ b/include/sysemu/nvmm.h @@ -0,0 +1,35 @@ +/* + * 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" + +int nvmm_init_vcpu(CPUState *); +int nvmm_vcpu_exec(CPUState *); +void nvmm_destroy_vcpu(CPUState *); + +void nvmm_cpu_synchronize_state(CPUState *); +void nvmm_cpu_synchronize_post_reset(CPUState *); +void nvmm_cpu_synchronize_post_init(CPUState *); +void nvmm_cpu_synchronize_pre_loadvm(CPUState *); + +#ifdef CONFIG_NVMM + +int nvmm_enabled(void); + +#else /* CONFIG_NVMM */ + +#define nvmm_enabled() (0) + +#endif /* CONFIG_NVMM */ + +#endif /* CONFIG_NVMM */