system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 03:06:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

x86/xen: remove parameter from fixup_console()

Browse source 
And instead fetch the metadata inside of the function.

This is done in preparation for changing the call site of fixup_console(),
which will no longer have the kernel metedata pointer in context.

No functional change intended.

Sponsored by: Cloud Software Group
Reviewed by: markj
Differential revision: https://reviews.freebsd.org/D43931
This commit is contained in:
Roger Pau Monné 2024-02-02 09:32:15 +01:00
parent e283c994ab
commit 848e2719af
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/x86/xen/pv.c
View file

@ -335,7 +335,7 @@ xen_pvh_parse_symtab(void)
#endif
static void
fixup_console(caddr_t kmdp)
fixup_console(void)
{
struct xen_platform_op op = {
.cmd = XENPF_get_dom0_console,
@ -346,10 +346,19 @@ fixup_console(caddr_t kmdp)
struct vbe_fb vbe;
} *fb = NULL;
int size;
caddr_t kmdp;
kmdp = preload_search_by_type("elf kernel");
if (kmdp == NULL)
kmdp = preload_search_by_type("elf64 kernel");
if (kmdp == NULL) {
xc_printf("Unable to find kernel metadata\n");
return;
}
size = HYPERVISOR_platform_op(&op);
if (size < 0) {
xc_printf("Failed to get dom0 video console info: %d\n", size);
xc_printf("Failed to get video console info: %d\n", size);
return;
}
@ -486,7 +495,7 @@ xen_pvh_parse_preload_data(uint64_t modulep)
else
strlcpy(bootmethod, "BIOS", sizeof(bootmethod));
fixup_console(kmdp);
fixup_console();
} else {
/* Parse the extra boot information given by Xen */
if (start_info->cmdline_paddr != 0)