xen/arch/x86/pv/dom0_build.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
elf_check_broken() only needs to be invoked after elf_xen_parse() and
after elf_load_binary().
Suggested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Jane Malalane <jane.malalane@citrix.com>
---
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: "Roger Pau Monné" <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>
---
xen/arch/x86/pv/dom0_build.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index 80e6c6e35b..db1e1e5edd 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -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));
}
--
2.11.0
On 13.08.2021 13:02, Jane Malalane wrote: > --- a/xen/arch/x86/pv/dom0_build.c > +++ b/xen/arch/x86/pv/dom0_build.c > @@ -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 Reviewed-by: Jan Beulich <jbeulich@suse.com> 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
© 2016 - 2024 Red Hat, Inc.