D37166.id113307.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D37166.id113307.diff
View Options

	diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
	--- a/sys/amd64/vmm/io/vioapic.h
	+++ b/sys/amd64/vmm/io/vioapic.h
	@@ -51,7 +51,7 @@
	uint64_t rval, int size, void arg);

	int vioapic_pincount(struct vm *vm);
	-void vioapic_process_eoi(struct vm *vm, int vcpuid, int vector);
	+void vioapic_process_eoi(struct vm *vm, int vector);
	#ifdef BHYVE_SNAPSHOT
	int vioapic_snapshot(struct vioapic *vioapic,
	struct vm_snapshot_meta *meta);
	diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
	--- a/sys/amd64/vmm/io/vioapic.c
	+++ b/sys/amd64/vmm/io/vioapic.c
	@@ -455,7 +455,7 @@
	}

	void
	-vioapic_process_eoi(struct vm *vm, int vcpuid, int vector)
	+vioapic_process_eoi(struct vm *vm, int vector)
	{
	struct vioapic *vioapic;
	int pin;
	diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
	--- a/sys/amd64/vmm/io/vlapic.c
	+++ b/sys/amd64/vmm/io/vlapic.c
	@@ -593,8 +593,7 @@
	vlapic->isrvec_stk_top--;
	vlapic_update_ppr(vlapic);
	if ((tmrptr[idx] & (1 << bitpos)) != 0) {
	- vioapic_process_eoi(vlapic->vm, vlapic->vcpuid,
	- vector);
	+ vioapic_process_eoi(vlapic->vm, vector);
	}
	return;
	}
	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
	@@ -1813,8 +1813,7 @@
	error = vm_handle_suspend(vm, vcpuid, &retu);
	break;
	case VM_EXITCODE_IOAPIC_EOI:
	- vioapic_process_eoi(vm, vcpuid,
	- vme->u.ioapic_eoi.vector);
	+ vioapic_process_eoi(vm, vme->u.ioapic_eoi.vector);
	break;
	case VM_EXITCODE_RENDEZVOUS:
	error = vm_handle_rendezvous(vcpu);