Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1563849

[PATCH 04/11] KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 20 Jan 2017 11:00:08 +0100

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 arch/powerpc/kvm/book3s_hv.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index a93e1c4445da..cfc7699d05df 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3509,11 +3509,9 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
 		return -EIO;
 
 	mutex_lock(&kvm->lock);
+	if (!kvm->arch.pimap)
+		goto unlock;
 
-	if (kvm->arch.pimap == NULL) {
-		mutex_unlock(&kvm->lock);
-		return 0;
-	}
 	pimap = kvm->arch.pimap;
 
 	for (i = 0; i < pimap->n_mapped; i++) {
@@ -3535,7 +3533,7 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
 	 * We don't free this structure even when the count goes to
 	 * zero. The structure is freed when we destroy the VM.
 	 */
-
+unlock:
 	mutex_unlock(&kvm->lock);
 	return 0;
 }
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/11] PowerPC-KVM: Fine-tuning for some function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:20 +0100
  [PATCH 02/11] KVM: PPC: Book3S HV: Improve a size determination in  kvmppc_alloc_hpt() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
  [PATCH 07/11] KVM: PPC: Book3S HV: Improve size determinations in  five functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
  [PATCH 01/11] KVM: PPC: Book3S HV: Move assignments for the variable  "err" in kvm_htab_write() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
    Re: [PATCH 01/11] KVM: PPC: Book3S HV: Move assignments for the  variable "err" in kvm_htab_write() Paolo Bonzini <pbonzini@redhat.com> - 2017-01-23 15:20 +0100
  [PATCH 10/11] KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
  [PATCH 04/11] KVM: PPC: Book3S HV: Use common error handling code in  kvmppc_clr_passthru_irq() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
  [PATCH 03/11] KVM: PPC: Book3S HV: Move error code assignments in two  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
    Re: [PATCH 03/11] KVM: PPC: Book3S HV: Move error code assignments in  two functions Paolo Bonzini <pbonzini@redhat.com> - 2017-01-23 15:20 +0100
  [PATCH 06/11] KVM: PPC: Book3S HV: Use kcalloc() in  kvmppc_alloc_host_rm_ops() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
  [PATCH 09/11] KVM: PPC: Book3S: Improve a size determination in two  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:30 +0100
    Re: [PATCH 09/11] KVM: PPC: Book3S: Improve a size determination in  two functions kbuild test robot <lkp@intel.com> - 2017-01-21 07:40 +0100
  [PATCH 11/11] KVM: PPC: Return directly after a failed  copy_from_user() in two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:40 +0100
  [PATCH 08/11] KVM: PPC: Book3S: Use seq_puts() in xics_debug_show() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:40 +0100
  [PATCH 05/11] KVM: PPC: Book3S HV: Adjust nine checks for null  pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-20 19:40 +0100
    Re: [PATCH 05/11] KVM: PPC: Book3S HV: Adjust nine checks for null  pointers Thomas Huth <thuth@redhat.com> - 2017-01-23 20:30 +0100

csiph-web