xen: move common variables off of sys/x86/xen/hvm.c
The xen_domain_type and HYPERVISOR_shared_info variables are shared by all Xen architectures, so they should be in common rather than reimplemented by each architecture. hvm_start_flags is used by xen_initial_domain() and so needs to be in common. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D28982
This commit is contained in:
parent
5e2183dab8
commit
6d765bff6f
@ -5205,6 +5205,7 @@ vm/vm_swapout_dummy.c optional NO_SWAPPING
|
|||||||
vm/vm_unix.c standard
|
vm/vm_unix.c standard
|
||||||
vm/vnode_pager.c standard
|
vm/vnode_pager.c standard
|
||||||
xen/features.c optional xenhvm
|
xen/features.c optional xenhvm
|
||||||
|
xen/xen_common.c optional xenhvm
|
||||||
xen/xenbus/xenbus_if.m optional xenhvm
|
xen/xenbus/xenbus_if.m optional xenhvm
|
||||||
xen/xenbus/xenbus.c optional xenhvm
|
xen/xenbus/xenbus.c optional xenhvm
|
||||||
xen/xenbus/xenbusb_if.m optional xenhvm
|
xen/xenbus/xenbusb_if.m optional xenhvm
|
||||||
|
@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
static void xen_hvm_cpu_init(void);
|
static void xen_hvm_cpu_init(void);
|
||||||
|
|
||||||
/*-------------------------------- Global Data -------------------------------*/
|
/*-------------------------------- Global Data -------------------------------*/
|
||||||
enum xen_domain_type xen_domain_type = XEN_NATIVE;
|
|
||||||
|
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
struct cpu_ops xen_hvm_cpu_ops = {
|
struct cpu_ops xen_hvm_cpu_ops = {
|
||||||
.cpu_init = xen_hvm_cpu_init,
|
.cpu_init = xen_hvm_cpu_init,
|
||||||
@ -83,12 +81,6 @@ static MALLOC_DEFINE(M_XENHVM, "xen_hvm", "Xen HVM PV Support");
|
|||||||
*/
|
*/
|
||||||
int xen_vector_callback_enabled;
|
int xen_vector_callback_enabled;
|
||||||
|
|
||||||
/**
|
|
||||||
* Start info flags. ATM this only used to store the initial domain flag for
|
|
||||||
* PVHv2, and it's always empty for HVM guests.
|
|
||||||
*/
|
|
||||||
uint32_t hvm_start_flags;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Signal whether the vector injected for the event channel upcall requires to
|
* Signal whether the vector injected for the event channel upcall requires to
|
||||||
* be EOI'ed on the local APIC.
|
* be EOI'ed on the local APIC.
|
||||||
@ -99,9 +91,6 @@ bool xen_evtchn_needs_ack;
|
|||||||
DPCPU_DEFINE(struct vcpu_info, vcpu_local_info);
|
DPCPU_DEFINE(struct vcpu_info, vcpu_local_info);
|
||||||
DPCPU_DEFINE(struct vcpu_info *, vcpu_info);
|
DPCPU_DEFINE(struct vcpu_info *, vcpu_info);
|
||||||
|
|
||||||
/*------------------ Hypervisor Access Shared Memory Regions -----------------*/
|
|
||||||
shared_info_t *HYPERVISOR_shared_info;
|
|
||||||
|
|
||||||
/*------------------------------ Sysctl tunables -----------------------------*/
|
/*------------------------------ Sysctl tunables -----------------------------*/
|
||||||
int xen_disable_pv_disks = 0;
|
int xen_disable_pv_disks = 0;
|
||||||
int xen_disable_pv_nics = 0;
|
int xen_disable_pv_nics = 0;
|
||||||
|
51
sys/xen/xen_common.c
Normal file
51
sys/xen/xen_common.c
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
/*-
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
||||||
|
*
|
||||||
|
* Copyright © 2008, 2013 Citrix Systems, Inc.
|
||||||
|
* Copyright © 2012 Spectra Logic Corporation
|
||||||
|
* Copyright © 2021 Elliott Mitchell
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||||
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||||
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
|
* SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
|
#include <sys/param.h> /* required by xen/xen-os.h */
|
||||||
|
|
||||||
|
#include <machine/atomic.h> /* required by xen/xen-os.h */
|
||||||
|
|
||||||
|
#include <xen/xen-os.h>
|
||||||
|
#include <xen/hvm.h>
|
||||||
|
|
||||||
|
/*-------------------------------- Global Data -------------------------------*/
|
||||||
|
enum xen_domain_type xen_domain_type = XEN_NATIVE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start info flags. ATM this only used to store the initial domain flag for
|
||||||
|
* PVHv2, and it's always empty for HVM guests.
|
||||||
|
*/
|
||||||
|
uint32_t hvm_start_flags;
|
||||||
|
|
||||||
|
/*------------------ Hypervisor Access Shared Memory Regions -----------------*/
|
||||||
|
shared_info_t *HYPERVISOR_shared_info;
|
Loading…
Reference in New Issue
Block a user