diff options
| author | royger <royger@FreeBSD.org> | 2014-03-11 10:09:23 +0000 |
|---|---|---|
| committer | royger <royger@FreeBSD.org> | 2014-03-11 10:09:23 +0000 |
| commit | 3c7c289c4650f5f61980f1e10778d931bebb2755 (patch) | |
| tree | 030377424ef21e9085fc03f2d6204dd25d2d42a1 /sys/conf | |
| parent | 57a42c756398e8543cdfb5f911e9e1a9a54145ec (diff) | |
| download | FreeBSD-src-3c7c289c4650f5f61980f1e10778d931bebb2755.zip FreeBSD-src-3c7c289c4650f5f61980f1e10778d931bebb2755.tar.gz | |
xen: add and enable Xen console for PVH guests
This adds and enables the PV console used on XEN kernels to
GENERIC/XENHVM kernels in order for it to be used on PVH.
Approved by: gibbs
Sponsored by: Citrix Systems R&D
dev/xen/console/console.c:
- Define console_page.
- Move xc_printf debug function from i386 XEN code to generic console
code.
- Rework xc_printf.
- Use xen_initial_domain instead of open-coded checks for Dom0.
- Gate the attach of the PV console to PV(H) guests.
dev/xen/console/xencons_ring.c:
- Allow the PV Xen console to output earlier by directly signaling
the event channel in start_info if the event channel is not yet
initialized.
- Use HYPERVISOR_start_info instead of xen_start_info.
i386/include/xen/xen-os.h:
- Remove prototype for xc_printf since it's now declared in global
xen-os.h
i386/xen/xen_machdep.c:
- Remove previous version of xc_printf.
- Remove definition of console_page (now it's defined in the console
itself).
- Fix some printf formatting errors.
x86/xen/pv.c:
- Add some early boot debug messages using xc_printf.
- Set console_page based on the value passed in start_info.
xen/xen-os.h:
- Declare console_page and add prototype for xc_printf.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/files b/sys/conf/files index c9fb99d..5344498 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2527,8 +2527,8 @@ dev/xe/if_xe_pccard.c optional xe pccard dev/xen/balloon/balloon.c optional xen | xenhvm dev/xen/blkfront/blkfront.c optional xen | xenhvm dev/xen/blkback/blkback.c optional xen | xenhvm -dev/xen/console/console.c optional xen -dev/xen/console/xencons_ring.c optional xen +dev/xen/console/console.c optional xen | xenhvm +dev/xen/console/xencons_ring.c optional xen | xenhvm dev/xen/control/control.c optional xen | xenhvm dev/xen/netback/netback.c optional xen | xenhvm dev/xen/netfront/netfront.c optional xen | xenhvm |
