c203fa6940
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.
109 lines
3.0 KiB
C
109 lines
3.0 KiB
C
/******************************************************************************
|
|
* xen/xen-os.h
|
|
*
|
|
* Random collection of macros and definition
|
|
*
|
|
* Copyright (c) 2003, 2004 Keir Fraser (on behalf of the Xen team)
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _XEN_XEN_OS_H_
|
|
#define _XEN_XEN_OS_H_
|
|
|
|
#if !defined(__XEN_INTERFACE_VERSION__)
|
|
#define __XEN_INTERFACE_VERSION__ 0x00030208
|
|
#endif
|
|
|
|
#define GRANT_REF_INVALID 0xffffffff
|
|
|
|
#ifdef LOCORE
|
|
#define __ASSEMBLY__
|
|
#endif
|
|
|
|
#include <machine/xen/xen-os.h>
|
|
|
|
#include <xen/interface/xen.h>
|
|
|
|
/* Everything below this point is not included by assembler (.S) files. */
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* Force a proper event-channel callback from Xen. */
|
|
void force_evtchn_callback(void);
|
|
|
|
extern shared_info_t *HYPERVISOR_shared_info;
|
|
extern start_info_t *HYPERVISOR_start_info;
|
|
|
|
/* XXX: we need to get rid of this and use HYPERVISOR_start_info directly */
|
|
extern struct xenstore_domain_interface *xen_store;
|
|
extern char *console_page;
|
|
|
|
enum xen_domain_type {
|
|
XEN_NATIVE, /* running on bare hardware */
|
|
XEN_PV_DOMAIN, /* running in a PV domain */
|
|
XEN_HVM_DOMAIN, /* running in a Xen hvm domain */
|
|
};
|
|
|
|
extern enum xen_domain_type xen_domain_type;
|
|
|
|
static inline int
|
|
xen_domain(void)
|
|
{
|
|
return (xen_domain_type != XEN_NATIVE);
|
|
}
|
|
|
|
static inline int
|
|
xen_pv_domain(void)
|
|
{
|
|
return (xen_domain_type == XEN_PV_DOMAIN);
|
|
}
|
|
|
|
static inline int
|
|
xen_hvm_domain(void)
|
|
{
|
|
return (xen_domain_type == XEN_HVM_DOMAIN);
|
|
}
|
|
|
|
static inline bool
|
|
xen_initial_domain(void)
|
|
{
|
|
return (xen_domain() && HYPERVISOR_start_info != NULL &&
|
|
(HYPERVISOR_start_info->flags & SIF_INITDOMAIN) != 0);
|
|
}
|
|
|
|
/* Debug/emergency function, prints directly to hypervisor console */
|
|
void xc_printf(const char *, ...) __printflike(1, 2);
|
|
|
|
#ifndef xen_mb
|
|
#define xen_mb() mb()
|
|
#endif
|
|
#ifndef xen_rmb
|
|
#define xen_rmb() rmb()
|
|
#endif
|
|
#ifndef xen_wmb
|
|
#define xen_wmb() wmb()
|
|
#endif
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* _XEN_XEN_OS_H_ */
|