D42299.id131158.diff
No OneTemporary
Actions

Size

858 B

Referenced Files

None

Subscribers

None

D42299.id131158.diff
View Options

	diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
	--- a/sys/amd64/vmm/amd/svm.c
	+++ b/sys/amd64/vmm/amd/svm.c
	@@ -1725,6 +1725,10 @@
	int vector, need_intr_window;
	int extint_pending;

	+ if (vcpu->caps & (1 << VM_CAP_MASK_HWINTR)) {
	+ return;
	+ }
	+
	state = svm_get_vmcb_state(vcpu);
	ctrl = svm_get_vmcb_ctrl(vcpu);

	@@ -2446,6 +2450,10 @@
	vlapic = vm_lapic(vcpu->vcpu);
	vlapic->ipi_exit = val;
	break;
	+ case VM_CAP_MASK_HWINTR:
	+ vcpu->caps &= ~(1 << VM_CAP_MASK_HWINTR);
	+ vcpu->caps \|= (val << VM_CAP_MASK_HWINTR);
	+ break;
	case VM_CAP_RFLAGS_TF: {
	uint64_t rflags;

	@@ -2529,6 +2537,9 @@
	case VM_CAP_RFLAGS_TF:
	*retval = !!(vcpu->caps & (1 << VM_CAP_RFLAGS_TF));
	break;
	+ case VM_CAP_MASK_HWINTR:
	+ *retval = !!(vcpu->caps & (1 << VM_CAP_MASK_HWINTR));
	+ break;
	default:
	error = ENOENT;
	break;