KVM: PPC: Drop unused @kvm_ro param from kvmppc_book3s_instantiate_page()

Drop @kvm_ro from kvmppc_book3s_instantiate_page() as it is now only
written, and never read.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20241010182427.1434605-63-seanjc@google.com>

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 10618622d7efc95ad9d04276b5b5f436a8223047..3d289dbe3982684cc0963c804a139834f9ec87b7 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -203,7 +203,7 @@ extern bool kvmppc_hv_handle_set_rc(struct kvm *kvm, bool nested,
 extern int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu,
                                unsigned long gpa,
                                struct kvm_memory_slot *memslot,
-                               bool writing, bool kvm_ro,
+                               bool writing,
                                pte_t *inserted_pte, unsigned int *levelp);
 extern int kvmppc_init_vm_radix(struct kvm *kvm);
 extern void kvmppc_free_radix(struct kvm *kvm);

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index 14891d0a3b73a446ee3409d631f07cd6b5ec71e1..b3e6e73d6a08842fda3ac810fa2dd079c8c40805 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -821,7 +821,7 @@ bool kvmppc_hv_handle_set_rc(struct kvm *kvm, bool nested, bool writing,
 int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu,
                                   unsigned long gpa,
                                   struct kvm_memory_slot *memslot,
-                                  bool writing, bool kvm_ro,
+                                  bool writing,
                                   pte_t *inserted_pte, unsigned int *levelp)
 {
        struct kvm *kvm = vcpu->kvm;
@@ -931,7 +931,6 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
        struct kvm_memory_slot *memslot;
        long ret;
        bool writing = !!(dsisr & DSISR_ISSTORE);
-       bool kvm_ro = false;
 
        /* Check for unusual errors */
        if (dsisr & DSISR_UNSUPP_MMU) {
@@ -984,7 +983,6 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
                                        ea, DSISR_ISSTORE | DSISR_PROTFAULT);
                        return RESUME_GUEST;
                }
-               kvm_ro = true;
        }
 
        /* Failed to set the reference/change bits */
@@ -1002,7 +1000,7 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
 
        /* Try to insert a pte */
        ret = kvmppc_book3s_instantiate_page(vcpu, gpa, memslot, writing,
-                                            kvm_ro, NULL, NULL);
+                                            NULL, NULL);
 
        if (ret == 0 || ret == -EAGAIN)
                ret = RESUME_GUEST;

diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 05f5220960c63bfccf930ccb868648fc9361a204..771173509617a7fb4be923a2350bdaee6c31284b 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -1527,7 +1527,6 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
        unsigned long n_gpa, gpa, gfn, perm = 0UL;
        unsigned int shift, l1_shift, level;
        bool writing = !!(dsisr & DSISR_ISSTORE);
-       bool kvm_ro = false;
        long int ret;
 
        if (!gp->l1_gr_to_hr) {
@@ -1607,7 +1606,6 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
                                        ea, DSISR_ISSTORE | DSISR_PROTFAULT);
                        return RESUME_GUEST;
                }
-               kvm_ro = true;
        }
 
        /* 2. Find the host pte for this L1 guest real address */
@@ -1629,7 +1627,7 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
        if (!pte_present(pte) || (writing && !(pte_val(pte) & _PAGE_WRITE))) {
                /* No suitable pte found -> try to insert a mapping */
                ret = kvmppc_book3s_instantiate_page(vcpu, gpa, memslot,
-                                       writing, kvm_ro, &pte, &level);
+                                       writing, &pte, &level);
                if (ret == -EAGAIN)
                        return RESUME_GUEST;
                else if (ret)