Date: Fri, 14 Apr 2023 14:01:07 GMT From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= <royger@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 6d765bff6f73 - main - xen: move common variables off of sys/x86/xen/hvm.c Message-ID: <202304141401.33EE1761084984@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=6d765bff6f739f4b9cb2c1463325395d9746d23c commit 6d765bff6f739f4b9cb2c1463325395d9746d23c Author: Elliott Mitchell <ehem+freebsd@m5p.com> AuthorDate: 2021-02-16 03:06:59 +0000 Commit: Roger Pau Monné <royger@FreeBSD.org> CommitDate: 2023-04-14 13:59:11 +0000 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 --- sys/conf/files | 1 + sys/x86/xen/hvm.c | 11 ----------- sys/xen/xen_common.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 6c7c6520d72a..4e981a135b0c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5205,6 +5205,7 @@ vm/vm_swapout_dummy.c optional NO_SWAPPING vm/vm_unix.c standard vm/vnode_pager.c standard xen/features.c optional xenhvm +xen/xen_common.c optional xenhvm xen/xenbus/xenbus_if.m optional xenhvm xen/xenbus/xenbus.c optional xenhvm xen/xenbus/xenbusb_if.m optional xenhvm diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 8edbda445dd5..a41c9ebdf745 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$"); static void xen_hvm_cpu_init(void); /*-------------------------------- Global Data -------------------------------*/ -enum xen_domain_type xen_domain_type = XEN_NATIVE; - #ifdef SMP struct cpu_ops xen_hvm_cpu_ops = { .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; -/** - * 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 * 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_info); -/*------------------ Hypervisor Access Shared Memory Regions -----------------*/ -shared_info_t *HYPERVISOR_shared_info; - /*------------------------------ Sysctl tunables -----------------------------*/ int xen_disable_pv_disks = 0; int xen_disable_pv_nics = 0; diff --git a/sys/xen/xen_common.c b/sys/xen/xen_common.c new file mode 100644 index 000000000000..586cc8bcf821 --- /dev/null +++ b/sys/xen/xen_common.c @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304141401.33EE1761084984>