From nobody Fri Jul 19 15:40:26 2024 X-Original-To: dev-commits-src-branches@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 4WQYlv2KyFz5Rr7Z; Fri, 19 Jul 2024 15:40:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQYlt6kWkz4t53; Fri, 19 Jul 2024 15:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403626; 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=8LrLhK+m2IonWVB02Kf71ago9mW/heWIM27wnd5OJ6k=; b=G+H/fzaVPx0/Ywkq+FIBDjUXut4YhiuVjTFbbh3ucQKJkqI5xcGJY3n7r6JupLnvQq1x3f KLGO3Oz7OkIv8o1uMtfJfGcUN3HeX2cFafJ5H0jvda/0940X00HzIZ26Bpg82ZW0QyA9Zd xWQ5+TGJLeMqow2FdDZn03sO7QFpBZcExVIXgGd8WVOkhYZCrc+o+6XuM6cxjR+pdbXsk2 fhFhc391oqgWvGmFuWgZLlC2E4pOFm0bAmJK09hskyDEhtEwji7nmVcZD88Po8qVqqJlV4 7JvgKXzCIpsyu0POcoBZVjNCPfARiLwtfVIvNsC9bTTdOYxsJk15ShEE3jvmVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721403626; a=rsa-sha256; cv=none; b=QzcbL+810pmTDkJz94r6pTgf+SPM02+SjCItXGJDH2WuadHzxCAadAeon9wsUIplabVdC0 KPPAnEak6SjpTgrfGiHNSqEYbRDVHNKrmgPIMUlWCwnNVeGgySkcfVHgdhCSuqUXAygAL3 u9fDZ+XmW7ROv7aMyzPbuhl+dC9H1GQfS1RFyXC1Vtp2gEw0w1YYHDmKz3jlg/gVj6JmXD utIk1MesenIWGSf5TlD2TgBDzxNKpC8bDAJH+ZQkgSmomLhiBNnXe+6QWrCgPfkFs72tc4 rRkZRoJLyhr1PY3K3RHudpTNsxPYuFiiHkBQP8Xs7zfs60+zDSb5ogYrCfaLuw== 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=1721403626; 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=8LrLhK+m2IonWVB02Kf71ago9mW/heWIM27wnd5OJ6k=; b=Kky8pLkgTtdS1grkXNFr62Yd2x9G7TK++UniPr9bjqeTKc/2xorWTaSVISiSiGffg9nRcE 7CDJF/1W+iqK1F9F4hBPfsfv4tbT+RQR6hIzKuELr3qrlooLNPEdwjWL/NBfeUJRGRJ6cY wePle7F4t/l/1DOdwogZ84pLFnGfGJ77lrUNAQnIFSukGiwjNWytr0AnknycdCB75XHu2g Y3DUWUTDTHJeVcmSMagHNM0nGR4KVc9483vHwzg/8/TUCtISwXo07yRGjbYz54SGz88kWN pbBqlRIYTvEXeu2beTmVzAyqMrm1wKblZB59P7HJqieGBc/kgARcEy3ocoeGnQ== 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 4WQYlt6Lgyzd8R; Fri, 19 Jul 2024 15:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46JFeQ0D083098; Fri, 19 Jul 2024 15:40:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JFeQTH083095; Fri, 19 Jul 2024 15:40:26 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:40:26 GMT Message-Id: <202407191540.46JFeQTH083095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 65e871e7c19a - stable/14 - i386: Use DEV_HYPERV to enable HyperV APIC vector List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 65e871e7c19a2dc9548df8f1cd189ad282c25b3d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=65e871e7c19a2dc9548df8f1cd189ad282c25b3d commit 65e871e7c19a2dc9548df8f1cd189ad282c25b3d Author: John Baldwin AuthorDate: 2024-04-14 02:10:44 +0000 Commit: John Baldwin CommitDate: 2024-07-18 17:31:50 +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 (cherry picked from commit e045163cce955c32332a02a8eb9a48f3c2cd3c3f) --- 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 c827e0bb7a69..326cb03fde8c 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 1a57015d0dcc..c5ad0a613eaa 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -316,8 +316,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