D33448.diff
No OneTemporary
Actions

Size

752 B

Referenced Files

None

Subscribers

None

D33448.diff
View Options

	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
	@@ -1740,10 +1740,13 @@

	SNAPSHOT_VAR_OR_LEAVE(ccr, meta, ret, done);

	- if (meta->op == VM_SNAPSHOT_RESTORE) {
	+ if (meta->op == VM_SNAPSHOT_RESTORE &&
	+ vlapic_enabled(vlapic) && lapic->icr_timer != 0) {
	/* Reset the value of the 'timer_fire_bt' and the vlapic
	* callout based on the value of the current count
	- * register saved when the VM snapshot was created
	+ * register saved when the VM snapshot was created.
	+ * If initial count register is 0, timer is not used.
	+ * Look at "10.5.4 APIC Timer" in Software Developer Manual.
	*/
	vlapic_reset_callout(vlapic, ccr);
	}