diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2011-05-31 10:50:10 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-06 11:46:00 -0400 |
commit | c2419b4a4727f67af2fc2cd68b0d878b75e781bb (patch) | |
tree | 0fdbd76174536c40ea00cb5011e3bc1b98cc3f3d /arch/x86/xen/enlighten.c | |
parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) |
xen: allow enable use of VGA console on dom0
Get the information about the VGA console hardware from Xen, and put
it into the form the bootloader normally generates, so that the rest
of the kernel can deal with VGA as usual.
[ Impact: make VGA console work in dom0 ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
[v1: Rebased on 2.6.39]
[v2: Removed incorrect comments and fixed compile warnings]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index e3c6a06cf725..4abd2d5d04f7 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1241,6 +1241,14 @@ asmlinkage void __init xen_start_kernel(void) | |||
1241 | if (pci_xen) | 1241 | if (pci_xen) |
1242 | x86_init.pci.arch_init = pci_xen_init; | 1242 | x86_init.pci.arch_init = pci_xen_init; |
1243 | } else { | 1243 | } else { |
1244 | const struct dom0_vga_console_info *info = | ||
1245 | (void *)((char *)xen_start_info + | ||
1246 | xen_start_info->console.dom0.info_off); | ||
1247 | |||
1248 | xen_init_vga(info, xen_start_info->console.dom0.info_size); | ||
1249 | xen_start_info->console.domU.mfn = 0; | ||
1250 | xen_start_info->console.domU.evtchn = 0; | ||
1251 | |||
1244 | /* Make sure ACS will be enabled */ | 1252 | /* Make sure ACS will be enabled */ |
1245 | pci_request_acs(); | 1253 | pci_request_acs(); |
1246 | } | 1254 | } |