D54856.id.diff
No OneTemporary
Actions

Size

676 B

Referenced Files

None

Subscribers

None

D54856.id.diff
View Options

	diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c
	--- a/sys/riscv/vmm/vmm.c
	+++ b/sys/riscv/vmm/vmm.c
	@@ -152,7 +152,6 @@
	int i;

	vm->cookie = vmmops_init(vm, vmspace_pmap(vm_vmspace(vm)));
	- MPASS(vm->cookie != NULL);

	CPU_ZERO(&vm->active_cpus);
	CPU_ZERO(&vm->debug_cpus);
	diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c
	--- a/sys/riscv/vmm/vmm_riscv.c
	+++ b/sys/riscv/vmm/vmm_riscv.c
	@@ -129,6 +129,8 @@
	size = round_page(sizeof(struct hyp) +
	sizeof(struct hypctx ) vm_get_maxcpus(vm));
	hyp = malloc_aligned(size, PAGE_SIZE, M_HYP, M_WAITOK \| M_ZERO);
	+ MPASS(hyp != NULL);
	+
	hyp->vm = vm;
	hyp->aplic_attached = false;