From fe60d8c08aa9ffc18f3dd54b0eae9bba40049f18 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Wed, 18 Jan 2017 08:38:35 +0000 Subject: i386 version of a fix that went in for amd64 previously (cpuid cacheline size info) --- sys/arch/i386/i386/vmm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/arch/i386/i386/vmm.c b/sys/arch/i386/i386/vmm.c index 333fdbb6ef2..c219addede9 100644 --- a/sys/arch/i386/i386/vmm.c +++ b/sys/arch/i386/i386/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.13 2017/01/13 02:38:41 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.14 2017/01/18 08:38:34 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -3835,7 +3835,7 @@ vmx_handle_cpuid(struct vcpu *vcpu) *eax = cpu_id; /* mask off host's APIC ID, reset to vcpu id */ *ebx = cpu_miscinfo & 0x00FFFFFF; - *ebx &= (vcpu->vc_id & 0xFF) << 24; + *ebx |= (vcpu->vc_id & 0xFF) << 24; /* * clone host capabilities minus: * debug store (CPUIDECX_DTES64, CPUIDECX_DSCPL, CPUID_DS) -- cgit v1.2.3