From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A6D0C4332F for ; Tue, 3 May 2022 18:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241524AbiECSew (ORCPT ); Tue, 3 May 2022 14:34:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241377AbiECSek (ORCPT ); Tue, 3 May 2022 14:34:40 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 270D317AA6 for ; Tue, 3 May 2022 11:31:00 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id u25-20020aa78499000000b0050d328e2f6bso9839510pfn.7 for ; Tue, 03 May 2022 11:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xswzH/Bbil9zpaQ4laTDHIN9myBOysbLUHFynw5y6xc=; b=VqB8rjIXOtLuE0VJ1xycczkIMarEZrfY/e2JGoH2Rr2NV7qkzB4ygYQtZr51hgCro0 UGK5tMHuWbqeFVCKG/vgmz1a/HoJlUfbCJGD65QT1tShrCWEujpNC4z0AkI+x9aMpJUC TXeioZyUTKy1Lpr9mIieayddzozTsUDqTMwjVJGPXQ0LZY8Bd5q3KZYJKCCPtfTTRXO4 UwHixsWHz8cDtdu+2SrYbok7/fH/FSjmwYMuR4LKa7uCnULL81IJOZog7zxTrO1dWxPX I8iXtPhLI39wezrY3pudK0kh83BIXP/tzpOBWlEdLegxtBjgpOzOvcDIWwYI84pd+r+c Dfuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xswzH/Bbil9zpaQ4laTDHIN9myBOysbLUHFynw5y6xc=; b=zQZZAG3fQ++77EOm/P+yibODWQfM07YtYx8lUfGyC8329tjy31IlyFjR0a7QPvBmpH kIO3M12Pg2eBFVtNwQ5KgEC6zmvXN3JEGl6NbqlEBdT39nn0gUs3LJunvbaLYpR9QJEs rajIzykIoIWFtInrcGjgoeaFF0QEFyVSkRjuYf17OeT9PTUPD9NecXQT8SG+UWMpbCBU DcGMzRfvH7nMLssVeH2IJgMN8xX+tMtTMBDWeujT8nGXzoiDTXmyrjeuDx2UcOLedmfl T/JzLtHc+w1qQWwcEN7f3ZY3FY+pn+FjVmSZmzD52YEUCIheanJB6TcbnENFNgdy6+D8 Qt8w== X-Gm-Message-State: AOAM532zYVaMI8V0Kxf0i4n+aHuWGEDR4PrEY7FEeLfQ+Yw70uL1BbwO hwebsUIVTps7iuGUhnYGucpXIRbtVRTH X-Google-Smtp-Source: ABdhPJyZ4iLDny5B9TJHOLEZRFr/+K04g9w9/rCRKqe1027R7q4Lcz3kfqmAjEjnxIIB82jFNN5gGg/+6Q3A X-Received: from sweer.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:e45]) (user=bgardon job=sendgmr) by 2002:a17:90a:fa06:b0:1d7:765d:111b with SMTP id cm6-20020a17090afa0600b001d7765d111bmr6080511pjb.185.1651602659687; Tue, 03 May 2022 11:30:59 -0700 (PDT) Date: Tue, 3 May 2022 18:30:41 +0000 In-Reply-To: <20220503183045.978509-1-bgardon@google.com> Message-Id: <20220503183045.978509-8-bgardon@google.com> Mime-Version: 1.0 References: <20220503183045.978509-1-bgardon@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH v7 07/11] KVM: x86: Fix errant brace in KVM capability handling From: Ben Gardon To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Peter Xu , Sean Christopherson , David Matlack , Jim Mattson , David Dunn , Jing Zhang , Junaid Shahid , Ben Gardon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The braces around the KVM_CAP_XSAVE2 block also surround the KVM_CAP_PMU_CAPABILITY block, likely the result of a merge issue. Simply move the curly brace back to where it belongs. Fixes: ba7bb663f5547 ("KVM: x86: Provide per VM capability for disabling PMU virtualization") Reviewed-by: David Matlack Reviewed-by: Peter Xu Signed-off-by: Ben Gardon --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ee8c91fa762..5ba9c7c8140a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4382,10 +4382,10 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) if (r < sizeof(struct kvm_xsave)) r = sizeof(struct kvm_xsave); break; + } case KVM_CAP_PMU_CAPABILITY: r = enable_pmu ? KVM_CAP_PMU_VALID_MASK : 0; break; - } case KVM_CAP_DISABLE_QUIRKS2: r = KVM_X86_VALID_QUIRKS; break; -- 2.36.0.464.gb9c8b46e94-goog