From owner-dev-commits-src-main@freebsd.org Wed Jul 28 15:27:57 2021 Return-Path: Delivered-To: dev-commits-src-main@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 78F7E65D067; Wed, 28 Jul 2021 15:27:57 +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 4GZcx91bT9z3LS2; Wed, 28 Jul 2021 15:27:57 +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 121C31FFDE; Wed, 28 Jul 2021 15:27:57 +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 16SFRuBq088046; Wed, 28 Jul 2021 15:27:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16SFRuFp088045; Wed, 28 Jul 2021 15:27:56 GMT (envelope-from git) Date: Wed, 28 Jul 2021 15:27:56 GMT Message-Id: <202107281527.16SFRuFp088045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 5f7000832791 - main - xen/netfront: introduce xen_pv_nics_disabled() 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: 5f7000832791716e63ca8481d6e5784915786ce0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 15:27:57 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7000832791716e63ca8481d6e5784915786ce0 commit 5f7000832791716e63ca8481d6e5784915786ce0 Author: Julien Grall AuthorDate: 2015-10-16 18:26:35 +0000 Commit: Roger Pau Monné CommitDate: 2021-07-28 15:27:04 +0000 xen/netfront: introduce xen_pv_nics_disabled() ARM guest is considered as HVM but it only supports PV nics (no emulation available). Submitted by: Elliott Mitchell Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D29405 --- sys/dev/xen/netfront/netfront.c | 2 +- sys/x86/include/xen/xen-os.h | 10 ++++++++++ sys/xen/xen-os.h | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index 4b8bd5589283..fd2d97a7c70c 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -378,7 +378,7 @@ static int netfront_probe(device_t dev) { - if (xen_hvm_domain() && xen_disable_pv_nics != 0) + if (xen_pv_nics_disabled()) return (ENXIO); if (!strcmp(xenbus_get_type(dev), "vif")) { diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 7ca1075e61f3..a6766190bfc2 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -43,6 +43,16 @@ /* If non-zero, the hypervisor has been configured to use a direct vector */ extern int xen_vector_callback_enabled; +/* tunable for disabling PV nics */ +extern int xen_disable_pv_nics; + +static inline bool +xen_pv_nics_disabled(void) +{ + + return (xen_hvm_domain() && xen_disable_pv_nics != 0); +} + #endif /* !__ASSEMBLY__ */ #endif /* _MACHINE_X86_XEN_XEN_OS_H_ */ diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 3b963bd20f7a..6817e96c10fc 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -75,7 +75,6 @@ xen_get_console_evtchn(void) extern shared_info_t *HYPERVISOR_shared_info; extern int xen_disable_pv_disks; -extern int xen_disable_pv_nics; extern bool xen_suspend_cancelled;