From nobody Tue Nov 28 13:38:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7Q4tccz52GbZ; Tue, 28 Nov 2023 13:38:42 +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 4Sfk7Q0TZwz4V0X; Tue, 28 Nov 2023 13:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwycVOra3WKTIpBMuFKjgQkOBJjtv34UVJGp+rPcNIE=; b=a4pMcPGJygPgn7QbPehFZkBy1IWqf6rxNqsOdnZDL4Kb8xYptUM4hWQgYK1X2ez+ZlIWKZ QtTfWBeGeRpz7WfqZMkPMbPLN5iwp3NMgq+V+ViOkoE5hnMiFAD/faqnqJ3AXhSR6VoVP/ 4iK6nrA85yFUAGkbxNUAUK2POgL3B2E9h1E3xsEgNJEpKvBKiouWXU4uBQcjxuBaud87SE OWKaZlBL3LwSjYL89+S+OyaY+xHhsm4Y09GU/BUyAkkVXfvExMtYgh43iRbRLu5mnjFtgC r/iVWso88ZD8DOquWLlMsot0OkHAiIyFeLyFfGMBzU4JJzuOQR3dwUFxdQmndQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwycVOra3WKTIpBMuFKjgQkOBJjtv34UVJGp+rPcNIE=; b=xbZ0QBjzFCH7j1LPjniU11Dfci+AzRUoKyA68Ot4Hj/67T7EXcgiWshQEvMa5hbz/NRO1N oUIHKHsSZ+pr01dYSfN2Rd0IXmRHTNif0SBOTFTCHXAHcDdJVdli1SEd3n7A9POXsqLkMF 0Fvf8dHQDqgQE2fPi/yGABO+8rdarl4v+v1ZcOShGjJ7DR28DuzoJDVG8ojchawtKg4lzH vhHzbUckjD9iVu9zDQ/3h+XBKOh3krjdzLvPK7bOLRMX+Fvo6725iJ7juh9c2gvzadB/ZW +E8J2pmD60SFjljI6T51qpt1YReKs8PzwcPrHh3O8sLeJpN+6paY6tpcb2KzXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178722; a=rsa-sha256; cv=none; b=Obg+lst4tYWmY1DWm+1+YSA0clxyBhVbq6/GQ35ZqR+gfr2wf7nC63rApXodAZ8aKFfcTy codkzuDoSSLTpkWwoBxCG7SXcVGw9uiKnyzHuY1GcXdBfLqTU6+MH8EjB0BBNcZnLxhUVa mTKj07MeCNlrqglpmi9x/cLPCFw/RhzWLvzPUuKQnBij0DyjPmE8e2DJf0EiUEo2ewqjpD 6rwkO/MpYtfUakZ6BWRbqikw5UMtpEpY7jnhLVWWdaulR+h2XfqX6jS9qSLPGROfbPwN/W kpjPi/ta8VMxga5FeQkbQMK48ra5n5wvKGB/UMsBlmr8KbBc4UX0gkBnNy3vjg== 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 4Sfk7P6jCcz87B; Tue, 28 Nov 2023 13:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASDcfoq025637; Tue, 28 Nov 2023 13:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcfb8025634; Tue, 28 Nov 2023 13:38:41 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:41 GMT Message-Id: <202311281338.3ASDcfb8025634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: c7368ccb6801 - main - xen: remove xen_domain_type enum/variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: c7368ccb68018c318f2320de2ff3c2b15127c8d6 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=c7368ccb68018c318f2320de2ff3c2b15127c8d6 commit c7368ccb68018c318f2320de2ff3c2b15127c8d6 Author: Elliott Mitchell AuthorDate: 2022-08-06 16:02:03 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:40:19 +0000 xen: remove xen_domain_type enum/variable The vm_guest variable readily covers all uses of xen_domain_type, so merge them together. Since support for PV domains has been removed hard-core xen_pv_domain() to return false. Reviewed by: royger --- sys/x86/xen/hvm.c | 6 ++---- sys/x86/xen/pv.c | 1 - sys/xen/xen-os.h | 20 ++++++-------------- sys/xen/xen_common.c | 2 -- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 602e5396b620..e096559711a3 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -345,15 +345,13 @@ xen_hvm_init(enum xen_hvm_init_type init_type) return; /* - * If xen_domain_type is not set at this point + * If the Xen domain type is not set at this point * it means we are inside a (PV)HVM guest, because * for PVH the guest type is set much earlier * (see hammer_time_xen). */ - if (!xen_domain()) { - xen_domain_type = XEN_HVM_DOMAIN; + if (!xen_domain()) vm_guest = VM_GUEST_XEN; - } setup_xen_features(); #ifdef SMP diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index c9537d153820..9ea276caee81 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -165,7 +165,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr) int rc; if (isxen()) { - xen_domain_type = XEN_HVM_DOMAIN; vm_guest = VM_GUEST_XEN; rc = xen_hvm_init_hypercall_stubs(XEN_HVM_INIT_EARLY); if (rc) { diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 2cb45d5d438b..d009b1af11fa 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -79,30 +79,22 @@ extern shared_info_t *HYPERVISOR_shared_info; extern bool xen_suspend_cancelled; -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 +static inline bool xen_domain(void) { - return (xen_domain_type != XEN_NATIVE); + return (vm_guest == VM_GUEST_XEN); } -static inline int +static inline bool xen_pv_domain(void) { - return (xen_domain_type == XEN_PV_DOMAIN); + return (false); } -static inline int +static inline bool xen_hvm_domain(void) { - return (xen_domain_type == XEN_HVM_DOMAIN); + return (vm_guest == VM_GUEST_XEN); } static inline bool diff --git a/sys/xen/xen_common.c b/sys/xen/xen_common.c index ae70a721477a..025f52cceee6 100644 --- a/sys/xen/xen_common.c +++ b/sys/xen/xen_common.c @@ -41,8 +41,6 @@ #include /*-------------------------------- 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.