diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-17 18:45:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-17 18:45:49 +0100 |
commit | 0eb392ec095ee29b932985deefb43e6d86d8a463 (patch) | |
tree | 778cd8e7313e867a2fce06a253ba706a2968f2c2 /include | |
parent | Merge tag 'riscv-for-linus-6.3-rc3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | xen: remove unnecessary (void*) conversions (diff) | |
download | linux-0eb392ec095ee29b932985deefb43e6d86d8a463.tar.xz linux-0eb392ec095ee29b932985deefb43e6d86d8a463.zip |
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 'include')
-rw-r--r-- | include/xen/interface/platform.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h index 655d92e803e1..79a443c65ea9 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -483,6 +483,8 @@ struct xenpf_symdata { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_symdata); +#define XENPF_get_dom0_console 64 + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -506,6 +508,7 @@ struct xen_platform_op { struct xenpf_mem_hotadd mem_add; struct xenpf_core_parking core_parking; struct xenpf_symdata symdata; + struct dom0_vga_console_info dom0_console; uint8_t pad[128]; } u; }; |