Skip to content

Commit dac09f6

Browse files
sean-jcbonzini
authored andcommitted
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 <[email protected]> Tested-by: Dmitry Osipenko <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Message-ID: <[email protected]>
1 parent 431d2f7 commit dac09f6

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

arch/powerpc/include/asm/kvm_book3s.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ extern bool kvmppc_hv_handle_set_rc(struct kvm *kvm, bool nested,
203203
extern int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu,
204204
unsigned long gpa,
205205
struct kvm_memory_slot *memslot,
206-
bool writing, bool kvm_ro,
206+
bool writing,
207207
pte_t *inserted_pte, unsigned int *levelp);
208208
extern int kvmppc_init_vm_radix(struct kvm *kvm);
209209
extern void kvmppc_free_radix(struct kvm *kvm);

arch/powerpc/kvm/book3s_64_mmu_radix.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ bool kvmppc_hv_handle_set_rc(struct kvm *kvm, bool nested, bool writing,
821821
int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu,
822822
unsigned long gpa,
823823
struct kvm_memory_slot *memslot,
824-
bool writing, bool kvm_ro,
824+
bool writing,
825825
pte_t *inserted_pte, unsigned int *levelp)
826826
{
827827
struct kvm *kvm = vcpu->kvm;
@@ -931,7 +931,6 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
931931
struct kvm_memory_slot *memslot;
932932
long ret;
933933
bool writing = !!(dsisr & DSISR_ISSTORE);
934-
bool kvm_ro = false;
935934

936935
/* Check for unusual errors */
937936
if (dsisr & DSISR_UNSUPP_MMU) {
@@ -984,7 +983,6 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
984983
ea, DSISR_ISSTORE | DSISR_PROTFAULT);
985984
return RESUME_GUEST;
986985
}
987-
kvm_ro = true;
988986
}
989987

990988
/* Failed to set the reference/change bits */
@@ -1002,7 +1000,7 @@ int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,
10021000

10031001
/* Try to insert a pte */
10041002
ret = kvmppc_book3s_instantiate_page(vcpu, gpa, memslot, writing,
1005-
kvm_ro, NULL, NULL);
1003+
NULL, NULL);
10061004

10071005
if (ret == 0 || ret == -EAGAIN)
10081006
ret = RESUME_GUEST;

arch/powerpc/kvm/book3s_hv_nested.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,6 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
15271527
unsigned long n_gpa, gpa, gfn, perm = 0UL;
15281528
unsigned int shift, l1_shift, level;
15291529
bool writing = !!(dsisr & DSISR_ISSTORE);
1530-
bool kvm_ro = false;
15311530
long int ret;
15321531

15331532
if (!gp->l1_gr_to_hr) {
@@ -1607,7 +1606,6 @@ static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu,
16071606
ea, DSISR_ISSTORE | DSISR_PROTFAULT);
16081607
return RESUME_GUEST;
16091608
}
1610-
kvm_ro = true;
16111609
}
16121610

16131611
/* 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,
16291627
if (!pte_present(pte) || (writing && !(pte_val(pte) & _PAGE_WRITE))) {
16301628
/* No suitable pte found -> try to insert a mapping */
16311629
ret = kvmppc_book3s_instantiate_page(vcpu, gpa, memslot,
1632-
writing, kvm_ro, &pte, &level);
1630+
writing, &pte, &level);
16331631
if (ret == -EAGAIN)
16341632
return RESUME_GUEST;
16351633
else if (ret)

0 commit comments

Comments
 (0)