From owner-dev-commits-src-all@freebsd.org Mon May 17 09:43:05 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20611641DE8; Mon, 17 May 2021 09:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FkDhT0HDrz3j8T; Mon, 17 May 2021 09:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E75841AB5; Mon, 17 May 2021 09:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14H9h4u5030617; Mon, 17 May 2021 09:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14H9h4Vh030616; Mon, 17 May 2021 09:43:04 GMT (envelope-from git) Date: Mon, 17 May 2021 09:43:04 GMT Message-Id: <202105170943.14H9h4Vh030616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: git: 2117a66af54f - main - xen: remove hypervisor_info MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2117a66af54f63cc474b4358bbb6967267e452cb Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2021 09:43:05 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=2117a66af54f63cc474b4358bbb6967267e452cb commit 2117a66af54f63cc474b4358bbb6967267e452cb Author: Mitchell Horne AuthorDate: 2021-05-06 21:16:10 +0000 Commit: Roger Pau Monné CommitDate: 2021-05-17 08:56:52 +0000 xen: remove hypervisor_info This was a source of indirection needed to support PVHv1. Now that that support has been removed, we can eliminate it. Reviewed by: royger --- sys/x86/xen/hvm.c | 44 -------------------------------------------- sys/xen/xen-os.h | 27 ++++++--------------------- 2 files changed, 6 insertions(+), 65 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 9b5b588234c4..569b113364b1 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -489,47 +489,3 @@ xen_hvm_cpu_init(void) DPCPU_SET(vcpu_info, vcpu_info); } SYSINIT(xen_hvm_cpu_init, SI_SUB_INTR, SI_ORDER_FIRST, xen_hvm_cpu_init, NULL); - -/* HVM/PVH start_info accessors */ -static vm_paddr_t -hvm_get_xenstore_mfn(void) -{ - - return (hvm_get_parameter(HVM_PARAM_STORE_PFN)); -} - -static evtchn_port_t -hvm_get_xenstore_evtchn(void) -{ - - return (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN)); -} - -static vm_paddr_t -hvm_get_console_mfn(void) -{ - - return (hvm_get_parameter(HVM_PARAM_CONSOLE_PFN)); -} - -static evtchn_port_t -hvm_get_console_evtchn(void) -{ - - return (hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN)); -} - -static uint32_t -hvm_get_start_flags(void) -{ - - return (hvm_start_flags); -} - -struct hypervisor_info hypervisor_info = { - .get_xenstore_mfn = hvm_get_xenstore_mfn, - .get_xenstore_evtchn = hvm_get_xenstore_evtchn, - .get_console_mfn = hvm_get_console_mfn, - .get_console_evtchn = hvm_get_console_evtchn, - .get_start_flags = hvm_get_start_flags, -}; diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 874c3b71b861..cd8a53aab54f 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -43,50 +43,35 @@ #include #ifndef __ASSEMBLY__ +#include #include -struct hypervisor_info { - vm_paddr_t (*get_xenstore_mfn)(void); - evtchn_port_t (*get_xenstore_evtchn)(void); - vm_paddr_t (*get_console_mfn)(void); - evtchn_port_t (*get_console_evtchn)(void); - uint32_t (*get_start_flags)(void); -}; -extern struct hypervisor_info hypervisor_info; - static inline vm_paddr_t xen_get_xenstore_mfn(void) { - return (hypervisor_info.get_xenstore_mfn()); + return (hvm_get_parameter(HVM_PARAM_STORE_PFN)); } static inline evtchn_port_t xen_get_xenstore_evtchn(void) { - return (hypervisor_info.get_xenstore_evtchn()); + return (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN)); } static inline vm_paddr_t xen_get_console_mfn(void) { - return (hypervisor_info.get_console_mfn()); + return (hvm_get_parameter(HVM_PARAM_CONSOLE_PFN)); } static inline evtchn_port_t xen_get_console_evtchn(void) { - return (hypervisor_info.get_console_evtchn()); -} - -static inline uint32_t -xen_get_start_flags(void) -{ - - return (hypervisor_info.get_start_flags()); + return (hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN)); } #endif @@ -132,7 +117,7 @@ static inline bool xen_initial_domain(void) { - return (xen_domain() && (xen_get_start_flags() & SIF_INITDOMAIN) != 0); + return (xen_domain() && (hvm_start_flags & SIF_INITDOMAIN) != 0); } /*