From nobody Fri Oct 09 15:00:07 2026 X-Original-To: dev-commits-src-main@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 4j1VQc2Pd7z6vbSS for ; Fri, 09 Oct 2026 15:00:08 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1VQc06ppz4RwF for ; Fri, 09 Oct 2026 15:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791558008; 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=Cyw4ktJWnkF2yngPeAXm2WebZj4kRht06i+p8JC96wU=; b=wweXtFZzjcIs8vp86QqWRoDei114g8mEzGEebQog3McnaTDEl8m5+uXBnJWhtER+R+YNj3 8NIStmlMxteDUJ3tzwZNM/t1AOONsZOU5Dc98BmFazeG1uN/VF1fb+lIlqFJ05V8QHS3wL +4gKHUyhpEu6pbjuNXPC22KXVovnSifL14iFhiJ3gx/qxmL1Y8DoGEm9oBxZCQMWviDzkF ndugbH+9b8fPcmMHzIPSXehSTzz5b/FcPfCWQHGv774rNNjm9wPp7Di5p5QeqQwhOfkZLw zDS+8yCdV6Bn9EPxWoBzQY8pjpBlALOcsEqFUUN85YFg9aykQVVxrQQlv+wgaQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791558008; b=PX14E3elNrwR6Z3T/MHFlTmba3OlTC5/e3UFpDWiYYNtObdGa7ZmNNOxEWiDulvngCM130 1gHeERFSm5RlZGLlr+axlEWBJfna1uuKpNKU20ehbILfmdvJBe6CUpPpHa0Pg4vK6qJz81 CQgNZyQ78jHh/OcW25ne89JvJBJC8VVzRzSmnCAI2l94UFuqVRj5lQowmF0RgVia/j0nSs xn0dR+juCscqF/P13zTQq938owJX3DGMWTQyWvRpRIU8qmDjf8BZ0a3DDPpepgUTUx5LQA 9NYldSV483ICa6Qmc1uziwqJmvim/OXYdI9EWRFUSnUFS7Sd7QF7r+VIXl/JwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791558008; 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=Cyw4ktJWnkF2yngPeAXm2WebZj4kRht06i+p8JC96wU=; b=FBvaCojGm+I/g1r4aJDvrFazcltVDVdJXGnP8/JfkDMPtVqGO0ec8zoNpqo7anevg5poAP h1b6JUWcT56mHo38gJC/g92VgiH9zZlElhuiWEwLhBGivEYr3pzMEZ6Kl+iPYYkOx10Rjx 4GTlicDKha6iBd7iuvRhEOid4PoQmhjEKU9K70Rub/0ves59k1UFf+bsQa/50/LfxqTjCD 10bpxzHveuowf3njs/bTaPfXRaGiDurbgCs0sVdb9gvUEDtS1RDvaJ6v/w5ewK2sEh5d3o kSpjhpf0uNSVrnglzqrn8dYDiAKrlPxgVBFmZTMFlXz1FVQH6CbTWRH65PQOig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j1VQb5dCqzFjW for ; Fri, 09 Oct 2026 15:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a830 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 15:00:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 406a74f780ab - main - bhyve: Use the new spelling of MPIDR_Aff* List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 406a74f780ab110137011d304ac9212a31bf6364 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 15:00:07 +0000 Message-Id: <6ac90177.3a830.439c27d1@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=406a74f780ab110137011d304ac9212a31bf6364 commit 406a74f780ab110137011d304ac9212a31bf6364 Author: Andrew Turner AuthorDate: 2026-10-09 14:53:25 +0000 Commit: Andrew Turner CommitDate: 2026-10-09 14:59:37 +0000 bhyve: Use the new spelling of MPIDR_Aff* Fixes: 6bf6fe1d70e7 ("arm64: Fix the MPIDR_EL1 field names") Sponsored by: Arm Ltd --- usr.sbin/bhyve/aarch64/bhyverun_machdep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c index 311170c6952b..f38c719a71a7 100644 --- a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c @@ -395,9 +395,9 @@ bhyve_init_platform(struct vmctx *ctx, struct vcpu *bsp) error = vm_get_register(fbsdrun_vcpu(cpu), VM_REG_GUEST_MPIDR_EL1, &mpidr); assert(error == 0); -#define MPIDR_AFF_MASK (MPIDR_AFF0_MASK | MPIDR_AFF1_MASK | MPIDR_AFF2_MASK | MPIDR_AFF3_MASK) - cpu_to_mpidr[cpu] = mpidr & MPIDR_AFF_MASK; -#undef MPIDR_AFF_MASK +#define MPIDR_Aff_MASK (MPIDR_Aff0_MASK | MPIDR_Aff1_MASK | MPIDR_Aff2_MASK | MPIDR_Aff3_MASK) + cpu_to_mpidr[cpu] = mpidr & MPIDR_Aff_MASK; +#undef MPIDR_Aff_MASK } bootrom = get_config_value("bootrom");