Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <06e16701-1380-8186-2f21-e5cc5a5c8467@redhat.com>
Date:   Wed, 19 Jan 2022 19:37:26 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.0
Subject: Re: [PATCH] selftests: kvm/x86: Fix the warning in
 pmu_event_filter_test.c
Content-Language: en-US
To:     Jinrong Liang <ljr.kernel@gmail.com>
Cc:     Wanpeng Li <wanpengli@tencent.com>,
        Sean Christopherson <seanjc@google.com>,
        Jim Mattson <jmattson@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Joerg Roedel <joro@8bytes.org>,
        Jinrong Liang <cloudliang@tencent.com>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20220119133910.56285-1-cloudliang@tencent.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
In-Reply-To: <20220119133910.56285-1-cloudliang@tencent.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 1/19/22 14:39, Jinrong Liang wrote:
> From: Jinrong Liang <cloudliang@tencent.com>
> 
> The following warning appears when executing
> make -C tools/testing/selftests/kvm
> 
> x86_64/pmu_event_filter_test.c: In function ‘vcpu_supports_intel_br_retired’:
> x86_64/pmu_event_filter_test.c:241:28: warning: variable ‘cpuid’ set but not used [-Wunused-but-set-variable]
>    241 |         struct kvm_cpuid2 *cpuid;
>        |                            ^~~~~
> x86_64/pmu_event_filter_test.c: In function ‘vcpu_supports_amd_zen_br_retired’:
> x86_64/pmu_event_filter_test.c:258:28: warning: variable ‘cpuid’ set but not used [-Wunused-but-set-variable]
>    258 |         struct kvm_cpuid2 *cpuid;
>        |                            ^~~~~
> 
> Just delete the unused variables to stay away from warnings.
> 
> Fixes: dc7e75b3b3ee ("selftests: kvm/x86: Add test for KVM_SET_PMU_EVENT_FILTER")
> Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
> ---
>   tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
> index 8ac99d4cbc73..0611a5c24bbc 100644
> --- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
> @@ -238,9 +238,7 @@ static void test_not_member_allow_list(struct kvm_vm *vm)
>   static bool vcpu_supports_intel_br_retired(void)
>   {
>   	struct kvm_cpuid_entry2 *entry;
> -	struct kvm_cpuid2 *cpuid;
>   
> -	cpuid = kvm_get_supported_cpuid();
>   	entry = kvm_get_supported_cpuid_index(0xa, 0);
>   	return entry &&
>   		(entry->eax & 0xff) &&
> @@ -255,9 +253,7 @@ static bool vcpu_supports_intel_br_retired(void)
>   static bool vcpu_supports_amd_zen_br_retired(void)
>   {
>   	struct kvm_cpuid_entry2 *entry;
> -	struct kvm_cpuid2 *cpuid;
>   
> -	cpuid = kvm_get_supported_cpuid();
>   	entry = kvm_get_supported_cpuid_index(1, 0);
>   	return entry &&
>   		((x86_family(entry->eax) == 0x17 &&

Queued, thanks.

Paolo