From patchwork Wed Mar 15 19:11:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 70388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp73848wrt; Wed, 15 Mar 2023 12:14:57 -0700 (PDT) X-Google-Smtp-Source: AK7set9afJyLBDTR6HpfA/lMXbX8lqIrrCZZjOEOH8pcvj38hgRxcg38Q5Twm7Uw48BA4JPeA+qF X-Received: by 2002:aa7:9784:0:b0:625:d682:4dd with SMTP id o4-20020aa79784000000b00625d68204ddmr411302pfp.33.1678907697157; Wed, 15 Mar 2023 12:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678907697; cv=none; d=google.com; s=arc-20160816; b=uKlOTQgxx9vfklQJy+R+AEsqWXZ+l1UEc+e4rs2IpZVboOBTjZ7Hpt+pRZQCzxyNpR DJio1kuPIzOKOdtb6AzYwudA+Nd6keYKtxjlF4fVg/qvKrLvj/GB5b2vRMhHaEi7w0A3 wFVRY0UvXlWofZfE8D7d9lYqSPCU8mS5KbqTajWL6tlCCUgmvGoPOtduqk7t6ef6Hce8 yzUqc6Vlehn7VQv1HSFvd2Pr9q7aE7crOCtbKQA1v33JlX10Y8AR9LHRRRRc5mbMLseN +DQGrwfRMMEsXe/GalhjJAOyKTZv+cgwxqsK8uSUxEd2RAhFd9YZb1w6LdOLIZQAPA4V E79Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=NrTG/RNvnmx6+qCUMITlqkHzZaqBZaogZoP5BHuvk2o=; b=CHjojnnjxT99T4QPwMlGXWpHlyOo8IFeQR8Sxzsve8buVOBtvf1R1ymBg0Ew6w0x9t JPjRAyNEiZ9Qoc206z9iPOy5AJdlbibktYlPYzgauul7BUqrw/ksH/lVJKDHqMxZOTam H3RwarIT1QSh8rJIkbbs4dUABz4K9H8KZHjfW2WbUcgOzChIG8rwJiCZCnqpdYwdBJk2 xtxJGdoaj5fTTyYTWZuZrz4UIzVMRStDLLjYNrJzU3Zt+THoBUo3zVIlwTyeL1vTqS/x ytixozUIo4lREF0Z6JZ8HVPS3B013lgyzEDC6FNP4fcBG2+rO4s4FrgdyNmJmglNoAiU +OVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ln4oqm3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d12-20020aa797ac000000b00625559a78a2si5395701pfq.107.2023.03.15.12.14.43; Wed, 15 Mar 2023 12:14:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ln4oqm3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232761AbjCOTLj (ORCPT + 99 others); Wed, 15 Mar 2023 15:11:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232746AbjCOTLf (ORCPT ); Wed, 15 Mar 2023 15:11:35 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6EF4838A5 for ; Wed, 15 Mar 2023 12:11:34 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 206-20020a2504d7000000b00b3511d10748so15090514ybe.20 for ; Wed, 15 Mar 2023 12:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678907494; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=NrTG/RNvnmx6+qCUMITlqkHzZaqBZaogZoP5BHuvk2o=; b=Ln4oqm3uMTtO1Ycn3E5ZXBvER2L0XR0Mog6BKVGC+G7ETMrCmliz22b5QbVcYzWucf 157OT8hIWXk1CwHAkYlJAm0E7I7okipnOsdZei5Syhx8/i6x9JyYUbUB6ZBHhdWxk2zb AZolc+nyJTHsoX6yGj5fQbX8hxqpvG79kHIQ6uai6mN+ClyxejQR/Qvhmk60e5N0TDL5 xMKRyAgS7Ob9o9EC+3QSPWFqmxyXssn5LMyqBBtg9qHG+A+Z3IC3RuajXDco0U1MUkjA LywmmAgrnbZdxT8Vcv4PeWh7NifgbSFSw9vo4rxDo2p7Hb/YEtj5Y6kz+t6gqGIUgIyt RkCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678907494; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NrTG/RNvnmx6+qCUMITlqkHzZaqBZaogZoP5BHuvk2o=; b=iexT2Q3aSOBp0ckZN5qBEYaCLR0VMtwn4Afm1LqyrA4/ZpzT3XDK62XT22K5MsXdUL fUWT9H0SkHtotfmlH8MMRgpMWSLclTGIzsAzkIMao0FW5lLhevVyTOB3pbFkmLEiTrOR Bti7OMm9FxTfDCV5FnDOSQ50MfRvl+JG/1A3bS4lGe0dnJGjDYfh4tBpIUwWL563ETZ1 m3rUZdzBQ/GE33w2Br+zPIqBd/hq8SZTFWNzi7iePfXdnLkGch3T3XQiK9qO2umdNdSa r5jQflQv6gn7PjFeGuPCyDjY3btmpRbyiUD8pXj3rBoZo+8M4NOsuOd5feZb4RMv4qCs xy1Q== X-Gm-Message-State: AO0yUKVd+AbuQ2gsaPYZcbkmy4ztqUN0Bht6lli+Rpcj9dguFKG50OQn e4Sb3hHbzeYTr39X5RT1LV/3UewNOEU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:8c84:0:b0:b23:4649:7ef3 with SMTP id m4-20020a258c84000000b00b2346497ef3mr13951296ybl.4.1678907494054; Wed, 15 Mar 2023 12:11:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 15 Mar 2023 12:11:28 -0700 In-Reply-To: <20230315191128.1407655-1-seanjc@google.com> Mime-Version: 1.0 References: <20230315191128.1407655-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc2.332.ga46443480c-goog Message-ID: <20230315191128.1407655-3-seanjc@google.com> Subject: [PATCH 2/2] KVM: SVM: Drop unprotected-by-braces variable declaration in case-statement From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Emanuele Giuseppe Esposito X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760462317014507008?= X-GMAIL-MSGID: =?utf-8?q?1760462317014507008?= Remove the intermediate "guest_flush_l1d" boolean to fix a build error on clang due to the variable being declared inside a case-statement without curly braces to create a proper code block. Fixes: cfc1f129df06 ("kvm: svm: Add IA32_FLUSH_CMD guest support") Cc: Emanuele Giuseppe Esposito Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 2780254d4362..70183d2271b5 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2970,9 +2970,8 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) PRED_CMD_IBPB, X86_FEATURE_IBPB); break; case MSR_IA32_FLUSH_CMD: - bool guest_flush_l1d = guest_cpuid_has(vcpu, - X86_FEATURE_FLUSH_L1D); - r = svm_set_msr_ia32_cmd(vcpu, msr, guest_flush_l1d, + r = svm_set_msr_ia32_cmd(vcpu, msr, + guest_cpuid_has(vcpu, X86_FEATURE_FLUSH_L1D), L1D_FLUSH, X86_FEATURE_FLUSH_L1D); break; case MSR_AMD64_VIRT_SPEC_CTRL: