From patchwork Thu Oct 27 16:18:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp326009wru; Thu, 27 Oct 2022 09:20:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5drYb5ag0vclSDso8XuPF+VG0hWZa214gQFlO6CfXjOH3/voIpQj7JsFkJDTJZpc0Mjvzx X-Received: by 2002:a17:907:3f0c:b0:78e:2090:6924 with SMTP id hq12-20020a1709073f0c00b0078e20906924mr44054592ejc.332.1666887640122; Thu, 27 Oct 2022 09:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666887640; cv=none; d=google.com; s=arc-20160816; b=RgXz8JKKKPKeBmxHqsgVPrVuUreZ1QHauNvvbM6Y7sYdOyyREf94tKbJRj4KtrY2Ip xcczOJDh0QLBL1UUdlWkCcflerfKc1VqJmSk4J4qLazFMPdaoEoc32kJF5464xC/Bbjm gj7QbBN868Zc28+ku+h9mXt4XojjkyyZLifMhwsevnWhz/66bxxf8bPgy396H2ZLx8fr wlOQVm/8pIuTvxn1+cv0k+ZdDxkhvj9+cJWLUSCN3Dqz959a+9HT1Fg+aCoPm8xLrK4u 7PXdEzLMMQQ++kPHEPmSKcE90NltBr17IB0Fb5EeJ4vSpAuTmHWY73DqSoUpycCZUHEi nNOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sdeKLDOmzDc50wX69zF5oFbNHmj+GE1oHwYqIBezFig=; b=woHo4zoPuj+2ORkrLR0jD8yw9jVwtFMWRSu3nFqYNbTkmnZGpbMNBo6822j+cWqWaa dDqmC8aXXVjiqusAsflpaz+vSE+QNp1DEX/3j3neK2kVakLv0dsPtI6n6T2Dmf1NYwqr CNYANxba1488SKoFaFKqSbUFZXrHX71o5/L6k/ARph3Ikx8TwyydExz0OEhwhhG/mNCu sYo5oOZSBPuw4wjJAD0Urzz+SWuugxGx8lMjdnNpACcrPFK0TVv1vLYrAzy1IXO/yuL3 NVSYNtbtxC+SNOamYxVoxyvaygK9ammxTfQF/imPzuyhBC/Dv4nTAvUPR1svs+KMdTmS v/Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FJMRcqkV; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020aa7df91000000b004573107a5basi1459076edy.352.2022.10.27.09.20.13; Thu, 27 Oct 2022 09:20:40 -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=@redhat.com header.s=mimecast20190719 header.b=FJMRcqkV; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236695AbiJ0QTf (ORCPT + 99 others); Thu, 27 Oct 2022 12:19:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236532AbiJ0QSz (ORCPT ); Thu, 27 Oct 2022 12:18:55 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD4DC18E71B for ; Thu, 27 Oct 2022 09:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666887534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sdeKLDOmzDc50wX69zF5oFbNHmj+GE1oHwYqIBezFig=; b=FJMRcqkV9EeVDQNcbqDaxEYKy1C7ghN6KzwTNdHapPg9/xAYdM+c5/VASgR+L5touXVIfN Uw4BRP7H2nmvjJQ5C1N9IrPwYeON2M/1qEMVts7qtlNh7K+zxBmOu6oNPQXikiFSwLOUry 5W1e40GUjOCNyKwpBmUtQWWcGDNvMfU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-164-jk2I3IdsMVml6cTGwIp4ag-1; Thu, 27 Oct 2022 12:18:51 -0400 X-MC-Unique: jk2I3IdsMVml6cTGwIp4ag-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 36A8A185A7A3; Thu, 27 Oct 2022 16:18:51 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14F131400B19; Thu, 27 Oct 2022 16:18:51 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: mhal@rbox.co, seanjc@google.com Subject: [PATCH 05/16] KVM: x86: Remove unused argument in gpc_unmap_khva() Date: Thu, 27 Oct 2022 12:18:38 -0400 Message-Id: <20221027161849.2989332-6-pbonzini@redhat.com> In-Reply-To: <20221027161849.2989332-1-pbonzini@redhat.com> References: <20221027161849.2989332-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1747858374380333644?= X-GMAIL-MSGID: =?utf-8?q?1747858374380333644?= From: Michal Luczaj Remove the unused @kvm argument from gpc_unmap_khva(). Signed-off-by: Michal Luczaj Signed-off-by: Sean Christopherson Message-Id: <20221013211234.1318131-6-seanjc@google.com> Signed-off-by: Paolo Bonzini --- virt/kvm/pfncache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index 23180f1d9c1c..32ccf168361b 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -98,7 +98,7 @@ bool kvm_gpc_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa, } EXPORT_SYMBOL_GPL(kvm_gpc_check); -static void gpc_unmap_khva(struct kvm *kvm, kvm_pfn_t pfn, void *khva) +static void gpc_unmap_khva(kvm_pfn_t pfn, void *khva) { /* Unmap the old pfn/page if it was mapped before. */ if (!is_error_noslot_pfn(pfn) && khva) { @@ -177,7 +177,7 @@ static kvm_pfn_t hva_to_pfn_retry(struct kvm *kvm, struct gfn_to_pfn_cache *gpc) * the existing mapping and didn't create a new one. */ if (new_khva != old_khva) - gpc_unmap_khva(kvm, new_pfn, new_khva); + gpc_unmap_khva(new_pfn, new_khva); kvm_release_pfn_clean(new_pfn); @@ -324,7 +324,7 @@ int kvm_gpc_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, gpa_t gpa, mutex_unlock(&gpc->refresh_lock); if (unmap_old) - gpc_unmap_khva(kvm, old_pfn, old_khva); + gpc_unmap_khva(old_pfn, old_khva); return ret; } @@ -353,7 +353,7 @@ void kvm_gpc_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc) write_unlock_irq(&gpc->lock); mutex_unlock(&gpc->refresh_lock); - gpc_unmap_khva(kvm, old_pfn, old_khva); + gpc_unmap_khva(old_pfn, old_khva); } EXPORT_SYMBOL_GPL(kvm_gpc_unmap);