From: mlarkin <mlarkin@openbsd.org>
Date: Wed, 13 Jul 2016 06:57:35 +0000 (+0000)
Subject: CPUID vendor ID was already register-swapped during initial query, so no
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f81acdc8f831ffbaa29eaa05e8ce9c17b0657ced;p=openbsd

CPUID vendor ID was already register-swapped during initial query, so no
need to do it again.
---

diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index d2cb5685080..24107ce7575 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmm.c,v 1.65 2016/06/28 05:50:55 mlarkin Exp $	*/
+/*	$OpenBSD: vmm.c,v 1.66 2016/07/13 06:57:35 mlarkin Exp $	*/
 /*
  * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -3359,8 +3359,8 @@ vmx_handle_cpuid(struct vcpu *vcpu)
 	case 0x00:	/* Max level and vendor ID */
 		*rax = 0x07; /* cpuid_level */
 		*rbx = *((uint32_t *)&cpu_vendor);
-		*rcx = *((uint32_t *)&cpu_vendor + 1);
-		*rdx = *((uint32_t *)&cpu_vendor + 2);
+		*rdx = *((uint32_t *)&cpu_vendor + 1);
+		*rcx = *((uint32_t *)&cpu_vendor + 2);
 		break;
 	case 0x01:	/* Version, brand, feature info */
 		*rax = cpu_id;