From nobody Sun Apr 14 02:12:23 2024 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 4VHDMq4GwSz5GkqV; Sun, 14 Apr 2024 02:12:23 +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 4VHDMq1ZMcz4Ft2; Sun, 14 Apr 2024 02:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713060743; 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=tyqg98KJXjPSPLC6mtnZNuFzH4Rsu0L2sKaIMUZMUNI=; b=OgrF+RRYxCa9ZS9hiIgkeDehBmfBsZEM2RSMNmIGGq5NMawns1H1b5hUXArTN6/XTpT/fJ 0keOukmBbcpslXCdAzF2BYgFg/n6QJA/N4K+3N5MQ0Tem8+//Y/PRTb9oT9Ez7TipUi4YJ CE3V18J2gtaj4NkYofdEHzVc9xFEFuX/Z6EpqrOLyNJmUUsCFyAyZTpGnK8RGobwUZMfQB 6cGlqECP2MpX7EqMuG3vpSTC9JcuMLV+KZ0ksi5ayqc0m+GGQJ6TtwsY9l/WU+Cu4nt3ov hb2rHl5SLXdmDVK/umSGNKfv2CPoMPUcMgrSYxknWR9ImVCqyiRj/tY5wInq2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713060743; a=rsa-sha256; cv=none; b=MsjIUOn2nJuggaK9EBJaUHQQuoE6kOj1l1Tk6Micl7rgsnhBtiItJRPuyhHX1e25GJGZ0R stqiI9hfnsh9Y9VFwVFwHuDqakhQuS+/aM6wsdVIbyq67oMECjYOsvzOtoFnGsCBASyreL jmUp+tRGv3LlgDhT1H88KS60w93B2NZwPwhjO9LHVrFkhQA26C4UMQfdCAb2gnR+6EVxnL Fn0yf68OeOcQfD8j3TowRuUkw//W/zti8klY2EIEfwG724a9WcyUwjh28jsP8vlWoIZeoj 3ThjPdbxcJEAdlEaSmQWnHsYpl+EmgjmLYr2Z11mL1K7/c3UnFv3vfodnCaRWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713060743; 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=tyqg98KJXjPSPLC6mtnZNuFzH4Rsu0L2sKaIMUZMUNI=; b=lPJOD37ehHGOb4rCaMNMJFDhf45/Tc1PPHxeevjGJzDvPx3ZaP8URis0iVhE5a+4dBZRYO E96rJvO7ryP1HZdYM4LxkxgIqB22vkj2lCnE/rqaS6/NH/+ospomegljOtMn0JrA6uWI9F 7O5I3dCjbR9XH8R3uIxf3c/UN8SJm7pS1ox4ZEZa3s2ooPzR2VRoIR1q9DXAGpKRQj9wRE nYI9HyEdMYWbLklQGf7xlaGiQ/hBQSeas/y79abcLRnG/CPp6kASYGU6wpaSPeEVloJaqa +irG+1HzmhbeEjVBu/2Ytqk4UJweDA202ldKPKnS8t8dz5Iq6TxeUBQp2m+ZKA== 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 4VHDMq17VpzxrD; Sun, 14 Apr 2024 02:12:23 +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 43E2CN9F030292; Sun, 14 Apr 2024 02:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43E2CN2r030289; Sun, 14 Apr 2024 02:12:23 GMT (envelope-from git) Date: Sun, 14 Apr 2024 02:12:23 GMT Message-Id: <202404140212.43E2CN2r030289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e045163cce95 - main - i386: Use DEV_HYPERV to enable HyperV APIC vector 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: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e045163cce955c32332a02a8eb9a48f3c2cd3c3f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e045163cce955c32332a02a8eb9a48f3c2cd3c3f commit e045163cce955c32332a02a8eb9a48f3c2cd3c3f Author: John Baldwin AuthorDate: 2024-04-14 02:10:44 +0000 Commit: John Baldwin CommitDate: 2024-04-14 02:10:44 +0000 i386: Use DEV_HYPERV to enable HyperV APIC vector This avoids requiring both 'device hyperv' and 'options HYPERV' for kernel configs. Instead, just 'device hyperv' can now be used matching the kernel configuration used for amd64. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44783 --- sys/conf/options.i386 | 2 +- sys/i386/conf/GENERIC | 2 -- sys/i386/conf/NOTES | 1 - sys/i386/i386/exception.S | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index b98591a2a7da..c577568c837f 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -97,7 +97,7 @@ NPX_DEBUG opt_npx.h BPF_JITTER opt_bpf.h # Hyper-V support -HYPERV opt_hyperv.h +DEV_HYPERV opt_hyperv.h XENHVM opt_global.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 461a21fe7b70..b5898ed94b81 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -327,8 +327,6 @@ device virtio_balloon # VirtIO Memory Balloon device device kvm_clock # KVM paravirtual clock driver # HyperV drivers and enhancement support -# NOTE: HYPERV depends on hyperv. They must be added or removed together. -options HYPERV # Kernel support for HyperV drivers device hyperv # HyperV drivers # Xen HVM Guest Optimizations diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index bab537ac1dfe..d421f2511478 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -660,7 +660,6 @@ device kvm_clock # KVM paravirtual clock driver # Google Virtual NIC device gve # Google Virtual NIC (gVNIC) driver -options HYPERV device hyperv # HyperV drivers device hvhid # HyperV HID device diff --git a/sys/i386/i386/exception.S b/sys/i386/i386/exception.S index 32456b63092b..a2a59db3c836 100644 --- a/sys/i386/i386/exception.S +++ b/sys/i386/i386/exception.S @@ -450,7 +450,7 @@ ENTRY(fork_trampoline) #include #endif -#ifdef HYPERV +#ifdef DEV_HYPERV .data .p2align 4 .text