diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-17 10:45:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-17 10:45:49 -0700 |
| commit | 0eb392ec095ee29b932985deefb43e6d86d8a463 (patch) | |
| tree | 778cd8e7313e867a2fce06a253ba706a2968f2c2 /arch/x86/xen/enlighten_pvh.c | |
| parent | cb80b960ce44e3e4e90985bb65a84c1a10c450ee (diff) | |
| parent | 7ad2c39860dc0ca01d2152232224d2124e160fe3 (diff) | |
Merge tag 'for-linus-6.3-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- cleanup for xen time handling
- enable the VGA console in a Xen PVH dom0
- cleanup in the xenfs driver
* tag 'for-linus-6.3-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: remove unnecessary (void*) conversions
x86/PVH: obtain VGA console info in Dom0
x86/xen/time: cleanup xen_tsc_safe_clocksource
xen: update arch/x86/include/asm/xen/cpuid.h
Diffstat (limited to 'arch/x86/xen/enlighten_pvh.c')
| -rw-r--r-- | arch/x86/xen/enlighten_pvh.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index bcae606bbc5c..1da44aca896c 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -43,6 +43,19 @@ void __init xen_pvh_init(struct boot_params *boot_params) x86_init.oem.banner = xen_banner; xen_efi_init(boot_params); + + if (xen_initial_domain()) { + struct xen_platform_op op = { + .cmd = XENPF_get_dom0_console, + }; + long ret = HYPERVISOR_platform_op(&op); + + if (ret > 0) + xen_init_vga(&op.u.dom0_console, + min(ret * sizeof(char), + sizeof(op.u.dom0_console)), + &boot_params->screen_info); + } } void __init mem_map_via_hcall(struct boot_params *boot_params_p) |