x86/pv: remove unnecessary use of goto out in construct_dom0()
PATCH 1/1 x86/pv: remove unnecessary use of goto out in construct_dom0()
elf_check_broken() only needs to be invoked after elf_xen_parse() and after elf_load_binary().
---
CC: Jan Beulich <[email protected]>
CC: Andrew Cooper <[email protected]>
CC: "Roger Pau Monné" <[email protected]>
CC: Wei Liu <[email protected]>
--- xen/arch/x86/pv/dom0_build.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
xen/arch/x86/pv/dom0_build.c +5 -10
@@ -379,8 +379,7 @@ int __init dom0_construct_pv(struct domain *d, }#else printk ("Found 32-bit PV kernel, but CONFIG_PV32 missing\n" ); - rc = -ENODEV ; - goto out; +return -ENODEV ;#endif }
@@ -404,8 +403,7 @@ int __init dom0_construct_pv(struct domain *d,if ( !compatible ) {printk ("Mismatch between Xen and DOM0 kernel\n" ); - rc = -EINVAL ; - goto out; +return -EINVAL ; }if ( parms.elf_notes[XEN_ELFNOTE_SUPPORTED_FEATURES ].type !=XEN_ENT_NONE )
@@ -413,8 +411,7 @@ int __init dom0_construct_pv(struct domain *d,if ( !pv_shim && !test_bit (XENFEAT_dom0, parms.f_supported) ) {printk ("Kernel does not support Dom0 operation\n" ); - rc = -EINVAL ; - goto out; +return -EINVAL ; } }
@@ -611,8 +608,7 @@ int __init dom0_construct_pv(struct domain *d, : (v_start < HYPERVISOR_VIRT_END) && (v_end > HYPERVISOR_VIRT_START) ) {printk ("DOM0 image overlaps with Xen private area.\n" ); - rc = -EINVAL ; - goto out; +return -EINVAL ; }if ( compat )
@@ -757,8 +753,7 @@ int __init dom0_construct_pv(struct domain *d,mapcache_override_current (NULL );switch_cr3_cr4 (current->arch.cr3,read_cr4 ());printk ("Invalid HYPERCALL_PAGE field in ELF notes.\n" ); - rc = -EINVAL ; - goto out; +return -EINVAL ; }init_hypercall_page (d,_p (parms.virt_hypercall)); }
Signature · 1 line
2.11.0
xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 384
Quoted 11 lines · Jane Malalane
xen/arch/x86/pv/dom0_build.c +1
-2@@ -379,8 +379,7 @@ int __init dom0_construct_pv(struct domain *d, }#else printk ("Found 32-bit PV kernel, but CONFIG_PV32 missing\n" ); - rc = -ENODEV ; - goto out; +return -ENODEV ;#endif }
Afaict here you're fixing up your own earlier patch, which hasn't gone in yet. I did expect you to alter that patch and resubmit, to then omit this hunk here (again in a resubmission). With that the patch here
Note that generally when a patch depends on another one which hasn't been committed yet, you'd point out this fact in a post-commit-message remark, so that reviewers (and possibly committer) are aware.
Jan