On Thu, Feb 15, 2024, Anish Moorthy wrote:
> KVM_HVA_ERR_RO_BAD satisfies kvm_is_error_hva(), so there's no need to
> duplicate the "if (writable)" block. Fix this by bringing all
> kvm_is_error_hva() cases under one conditional.
>
> Signed-off-by: Anish Moorthy <amoorthy@xxxxxxxxxx>
> ---
> virt/kvm/kvm_main.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 7186d301d617..67ca580a18c5 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -3031,15 +3031,13 @@ kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,
> if (hva)
> *hva = addr;
>
> - if (addr == KVM_HVA_ERR_RO_BAD) {
> - if (writable)
> - *writable = false;
> - return KVM_PFN_ERR_RO_FAULT;
> - }
> -
> if (kvm_is_error_hva(addr)) {
> if (writable)
> *writable = false;
> +
> + if (addr == KVM_HVA_ERR_RO_BAD)
> + return KVM_PFN_ERR_RO_FAULT;
> +
> return KVM_PFN_NOSLOT;
This would be a good use of a ternary operator, e.g. to make it super obvious
that "if (kvm_is_error_hva(addr))" is terminal in all cases. I'll fixup when
applying.
> }
>
> --
> 2.44.0.rc0.258.g7320e95886-goog
>
