* Re: [PATCH] kvm:Return -ENOMEM directly for the function, kvm_create_lapic [not found] <1432169486-31846-1-git-send-email-xerofoify@gmail.com> @ 2015-05-21 6:09 ` Ingo Molnar 2015-05-21 12:22 ` Paolo Bonzini 0 siblings, 1 reply; 2+ messages in thread From: Ingo Molnar @ 2015-05-21 6:09 UTC (permalink / raw) To: Nicholas Krause; +Cc: gleb, pbonzini, x86, kvm, linux-kernel * Nicholas Krause <xerofoify@gmail.com> wrote: > In order to make code paths easier to read in the function, > kvm_create_lapic we return -ENOMEM when unable to allocate > memory for a kvm_lapic structure pointer directly. This > makes the code easier to read and cleaner then jumping > to a goto label at the end of the function's body for > returning just the error code, -ENOMEM. > > Signed-off-by: Nicholas Krause <xerofoify@gmail.com> > --- > arch/x86/kvm/lapic.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 629af0f..88d0cce 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1687,7 +1687,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) > > apic = kzalloc(sizeof(*apic), GFP_KERNEL); > if (!apic) > - goto nomem; > + return -ENOMEM; > > vcpu->arch.apic = apic; > > @@ -1718,7 +1718,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) > return 0; > nomem_free_apic: > kfree(apic); > -nomem: > return -ENOMEM; > } NAK! You just half destroyed the nice error handling cascade of labels. Thanks, Ingo ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] kvm:Return -ENOMEM directly for the function, kvm_create_lapic 2015-05-21 6:09 ` [PATCH] kvm:Return -ENOMEM directly for the function, kvm_create_lapic Ingo Molnar @ 2015-05-21 12:22 ` Paolo Bonzini 0 siblings, 0 replies; 2+ messages in thread From: Paolo Bonzini @ 2015-05-21 12:22 UTC (permalink / raw) To: Ingo Molnar, Nicholas Krause; +Cc: gleb, x86, kvm, linux-kernel On 21/05/2015 08:09, Ingo Molnar wrote: > > * Nicholas Krause <xerofoify@gmail.com> wrote: > >> In order to make code paths easier to read in the function, >> kvm_create_lapic we return -ENOMEM when unable to allocate >> memory for a kvm_lapic structure pointer directly. This >> makes the code easier to read and cleaner then jumping >> to a goto label at the end of the function's body for >> returning just the error code, -ENOMEM. >> >> Signed-off-by: Nicholas Krause <xerofoify@gmail.com> >> --- >> arch/x86/kvm/lapic.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c >> index 629af0f..88d0cce 100644 >> --- a/arch/x86/kvm/lapic.c >> +++ b/arch/x86/kvm/lapic.c >> @@ -1687,7 +1687,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) >> >> apic = kzalloc(sizeof(*apic), GFP_KERNEL); >> if (!apic) >> - goto nomem; >> + return -ENOMEM; >> >> vcpu->arch.apic = apic; >> >> @@ -1718,7 +1718,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) >> return 0; >> nomem_free_apic: >> kfree(apic); >> -nomem: >> return -ENOMEM; >> } > > NAK! > > You just half destroyed the nice error handling cascade of labels. Right. What could be done, is always going through kfree(apic), because it is okay to free NULL. So the nomem label moves up, and the nomem_free_apic label is not necessary anymore. Paolo ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-21 12:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1432169486-31846-1-git-send-email-xerofoify@gmail.com>
2015-05-21 6:09 ` [PATCH] kvm:Return -ENOMEM directly for the function, kvm_create_lapic Ingo Molnar
2015-05-21 12:22 ` Paolo Bonzini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).