Message ID | 1549390526-24246-26-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NkTBud7i"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vCcj3TwMz9s7h for <incoming@patchwork.ozlabs.org>; Wed, 6 Feb 2019 05:23:17 +1100 (AEDT) Received: from localhost ([127.0.0.1]:37139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gr5NL-0007ba-EM for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2019 13:23:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5GK-0002M6-2g for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5GI-0003no-2J for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:00 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:50595) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1gr5GH-0003iq-LM for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:15:57 -0500 Received: by mail-wm1-x329.google.com with SMTP id z5so4668639wmf.0 for <qemu-devel@nongnu.org>; Tue, 05 Feb 2019 10:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=zlw4otX+sXF2EUUfBbepsg2Nz8RseQqACaPDBHAzgsM=; b=NkTBud7ik4gr+Y7/6x1Ibev78sw73hlBPrNO5qNDiMxxyxmK3KWZixaBoUCjKPE3dj 8b1EkrR4ppka8OvwJWV6E1UMfaFIarlMCEL+8bXwn4YrUZqO8KMJ9ego1ZM20NA/fTgY 3mW1sVxdZd1mcCOoH++bkUS2+H7gIo+vFOLZniTHDClpJRITaiyBgysO3grQN1+VQRGC AVMk93u1dSIaIKV1XM6p4QQeSTnwR+cXUYNaOtb5MZB4cLKYyVLjCoJBNgKaFcxGkF// Csr+MHJLdx1D3KDNiLRUqq3XMuJnz0CNuGaDVTfMWr+OypL6cRINguM4DO/NL2IyG8f/ pgyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=zlw4otX+sXF2EUUfBbepsg2Nz8RseQqACaPDBHAzgsM=; b=WdhgHnPLCtj76qcXY7p2ne6e4rgKuacZkB+FO4h8ZKZ74duNYzk7Amtk2u9X7PRyuI YHWnPZE9arc6brpcgfJEhOz+OuSYE6xq61zHD42AGxtq5momN0ER21xagkgu2htr/EN/ nGfVwjfuNAD4RjvWy6CcHGEbzijM2gBEfK9o31BrqkM0uWfo95Vx4+kvz7trpYRC65NT SQP7M7unExM149OYTCkcaffOFE0yKFMUsxHdM/BEmFiRCn97gAzy/04UHVB+eSlpUwvy n3nKClc7MIsg+0cTXsRcyy4HxGd/JnozLdiCoAr4XKXl16ORsJDf1vrG5pzUO01usZVG sR+A== X-Gm-Message-State: AHQUAuZ66y7lk1MkYLNYeR9cQvsVmTvCGk8beeh2uaATWSTz1Kq6PSdp fV+zkLAuIevPf66idVn87RW3uI37 X-Google-Smtp-Source: AHgI3IZckwSjHrc3YLJ8bk/1mL43G2IHxhu5IZMk09rVlxlHwycpPnRXBCfcP1NnQybCEhbc+OCOzA== X-Received: by 2002:a7b:c4cb:: with SMTP id g11mr4772909wmk.149.1549390554442; Tue, 05 Feb 2019 10:15:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.15.53 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:15:53 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:14:35 +0100 Message-Id: <1549390526-24246-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PULL 25/76] target-i386: hvf: remove MPX support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/76] vhost-user-test: use g_cond_broadcast
|
expand
|
diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index 9874a46..4d957fe 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -38,16 +38,6 @@ static uint64_t xgetbv(uint32_t xcr) return (((uint64_t)edx) << 32) | eax; } -static bool vmx_mpx_supported() -{ - uint64_t cap_exit, cap_entry; - - hv_vmx_read_capability(HV_VMX_CAP_ENTRY, &cap_entry); - hv_vmx_read_capability(HV_VMX_CAP_EXIT, &cap_exit); - - return ((cap_exit & (1 << 23)) && (cap_entry & (1 << 16))); -} - uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg) { @@ -92,11 +82,8 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, CPUID_7_0_EBX_CLFLUSHOPT | CPUID_7_0_EBX_CLWB | CPUID_7_0_EBX_AVX512DQ | CPUID_7_0_EBX_SHA_NI | CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512VL | - CPUID_7_0_EBX_INVPCID | CPUID_7_0_EBX_MPX; + CPUID_7_0_EBX_INVPCID; - if (!vmx_mpx_supported()) { - ebx &= ~CPUID_7_0_EBX_MPX; - } hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap); if (!(cap & CPU_BASED2_INVPCID)) { ebx &= ~CPUID_7_0_EBX_INVPCID; @@ -119,9 +106,6 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, XSTATE_BNDCSR_MASK | XSTATE_OPMASK_MASK | XSTATE_ZMM_Hi256_MASK | XSTATE_Hi16_ZMM_MASK); eax &= supp_xcr0; - if (!vmx_mpx_supported()) { - eax &= ~(XSTATE_BNDREGS_MASK | XSTATE_BNDCSR_MASK); - } } else if (idx == 1) { hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap); eax &= CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XGETBV1;
MPX support is being phased out by Intel and actually I am not sure that OS X has ever enabled it in XCR0. Drop it from the Hypervisor.framework acceleration. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- target/i386/hvf/x86_cpuid.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)