D48268.1794794298.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D48268.1794794298.diff
View Options

	diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
	--- a/sys/amd64/include/vmm.h
	+++ b/sys/amd64/include/vmm.h
	@@ -401,7 +401,7 @@

	void vcpu_stats(struct vcpu vcpu);
	void vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr);
	-struct vmspace vm_get_vmspace(struct vm vm);
	+struct vmspace vm_vmspace(struct vm vm);
	struct vatpic vm_atpic(struct vm vm);
	struct vatpit vm_atpit(struct vm vm);
	struct vpmtmr vm_pmtmr(struct vm vm);
	diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
	--- a/sys/amd64/vmm/vmm.c
	+++ b/sys/amd64/vmm/vmm.c
	@@ -2677,9 +2677,8 @@
	}

	struct vmspace *
	-vm_get_vmspace(struct vm *vm)
	+vm_vmspace(struct vm *vm)
	{
	-
	return (vm->vmspace);
	}

	diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c
	--- a/sys/amd64/vmm/vmm_dev_machdep.c
	+++ b/sys/amd64/vmm/vmm_dev_machdep.c
	@@ -441,7 +441,7 @@
	break;
	case VM_GET_GPA_PMAP:
	gpapte = (struct vm_gpa_pte *)data;
	- pmap_get_mapping(vmspace_pmap(vm_get_vmspace(vm)),
	+ pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)),
	gpapte->gpa, gpapte->pte, &gpapte->ptenum);
	error = 0;
	break;