D61316.1794229774.diff
No OneTemporary
Actions

Authored By

Unknown

Size

801 B

Referenced Files

None

Subscribers

None

D61316.1794229774.diff
View Options

	diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
	--- a/sys/amd64/vmm/x86.c
	+++ b/sys/amd64/vmm/x86.c
	@@ -131,14 +131,15 @@
	break;
	case CPUID_8000_0008:
	cpuid_count(func, param, regs);
	- if (vmm_is_svm()) {
	- /*
	- * As on Intel (0000_0007:0, EDX), mask out
	- * unsupported or unsafe AMD extended features
	- * (8000_0008 EBX).
	- */
	- regs[1] &= AMDFEID_CLZERO \| AMDFEID_XSAVEERPTR;
	+ /*
	+ * As with 0000_0007:0 EDX, mask out unsupported or
	+ * unsafe extended features in 8000_0008 EBX. These
	+ * are AMD-defined, but an outer hypervisor may also
	+ * report them on Intel hosts.
	+ */
	+ regs[1] &= AMDFEID_CLZERO \| AMDFEID_XSAVEERPTR;

	+ if (vmm_is_svm()) {
	vm_get_topology(vm, &sockets, &cores, &threads,
	&maxcpus);
	/*