From nobody Sun Sep 06 01:25:45 2026 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 4hcsw92kV6z6rRdp for ; Sun, 06 Sep 2026 01:25:45 +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 4hcsw928jyz3RFM for ; Sun, 06 Sep 2026 01:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788657945; 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=u7Wfkf/1sOj8ja6zEGavf2kg633apyEZJDm/+0JZ5wE=; b=PD1DyEvtChJnsqyEszClxNPp0QW20ohHhVsIGsE/55jFUMwBoEykNraU1yF5/i/douptoi k3B8AiaPi6tdxh1jxyU/HT9pZpPkohZqVCecAHm3Z8XzL8c4Qm42RKg1U4pO7jOJ91SQw9 WFwC88XNIFRcCHREeYyclHy10sr4ie/+pIXRPgSHxs6ciXgt3ICjk18O4dvzpbdAgHBCxI 0xk03wnuCQBCWwj3KbgIAF2Yl6iZvYwRb+Oi4nWWGsl33qSIj4ok9mLzxgUc4pI6UH770Z dZAoG7peQyRtCt7z/ZZ/hLs61iAeXarvs3nCTV11P2KxbD/fYPyIhV+uBrSFIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788657945; a=rsa-sha256; cv=none; b=TbbW6aZyYYW76TPB79dG2brQucFUQfS7yAQ7Dv1d9Ug7JccX8Alvlh7NzidJoeR9tk3Rds k2R7LROYO7sw84H678Xgt7lnHREs1K/MwITOmKX5hPX68zRThoBc4n/k5pWG58t8gDGoyk K1rIqwYiei8w8xwKZyk2V2e6Hwodnh/iMwhTEXCcNfCXc4fTmJcKWAqZiEdXzviDAW8YXN 7JWVg3LpGxAcCM3lz+yOziWOsOTochWiGTV6JEQZ4zPvR6UUzqmS7lyRtqCyYGdSuOxrhS OsOdM5zp1CSm+NspzpXSsBVpp36u2on1OaEcHt8pqJPLVWmbxFYoiySSHNupYg== 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=1788657945; 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=u7Wfkf/1sOj8ja6zEGavf2kg633apyEZJDm/+0JZ5wE=; b=vGBJiZQvGht69W3MV9i34fVxtVIkW4vAEvLp+HeoJ0AI4pL2TT2bToO5GoQOupTMv/NujW 2ARnLM2EM79dCRWw2RBfHMMre0Iqppo9u6kwlQpwqHUJv4D5xocMXvTnNVnauWWgB14OII DQsfw/4JCf2UTR1PTrVjSkYDKdvsbzslzdXSoMkc4h4DYFTvdo1T2in0BrOfsI2We16HDV SDN5ZWR2o7GO/nu/PSGCKbWJLVIgFzYTL3x4UigCvFHdUzUT0Hc6tctpoPgKRjcE4KZWrC qydn/56LSc8L3NLlCmfojjnXuLg3M/ZWORKrtzMeMP0+DrALATPyaxmnvh7sfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcsw90ZlBz18ZB for ; Sun, 06 Sep 2026 01:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3792c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 01:25:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 2e33355ee2bf - main - pmc: avoid illegal flexible array member 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 Sender: owner-dev-commits-src-all@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: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e33355ee2bfa0b6d7b61aeca66d9b2b2b7b9e56 Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 01:25:45 +0000 Message-Id: <6a9cc119.3792c.22d6fb9d@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=2e33355ee2bfa0b6d7b61aeca66d9b2b2b7b9e56 commit 2e33355ee2bfa0b6d7b61aeca66d9b2b2b7b9e56 Author: Ryan Libby AuthorDate: 2026-09-05 22:45:39 +0000 Commit: Ryan Libby CommitDate: 2026-09-06 00:58:36 +0000 pmc: avoid illegal flexible array member Remove struct pmchdr_cpuidinfo which was just a wrapper around a flexible array member of uint32_t. Flexible array members are non-standard in C++, and even in C are not allowed as the only member of a struct. GCC errored out on pmchdr_cpuidinfo, but did not complain about pmchdr_pmcinfo, so I left it alone here, though it is also non-standard. Fixes: 93da997ef759 ("pmc: new pmc log processing framework") Reviewed by: Ali Mashtizadeh Differential Revision: https://reviews.freebsd.org/D59355 --- usr.sbin/pmc/headers.hh | 5 ----- usr.sbin/pmc/view.cc | 14 +++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/usr.sbin/pmc/headers.hh b/usr.sbin/pmc/headers.hh index 6bdabc4fbe6c..175954d3dcaf 100644 --- a/usr.sbin/pmc/headers.hh +++ b/usr.sbin/pmc/headers.hh @@ -74,10 +74,5 @@ struct pmchdr_pmcinfo char pmc[]; }; -struct pmchdr_cpuidinfo -{ - uint32_t cpuid[]; -}; - #endif diff --git a/usr.sbin/pmc/view.cc b/usr.sbin/pmc/view.cc index f3585ac75043..d633b6737e34 100644 --- a/usr.sbin/pmc/view.cc +++ b/usr.sbin/pmc/view.cc @@ -177,12 +177,12 @@ int pmcview::process_cpuidinfo(int logfd, const pmchdr_infohdr &infohdr) { int status; - pmchdr_cpuidinfo *cpuidinfo; + uint32_t *cpuidinfo; int offset, len; uint32_t root, maxleaf, count; len = infohdr.length / 4; - cpuidinfo = (pmchdr_cpuidinfo *)new uint32_t[len]; + cpuidinfo = new uint32_t[len]; status = readlog(logfd, cpuidinfo, infohdr.length); if (status < 0 || status != infohdr.length) @@ -191,7 +191,7 @@ pmcview::process_cpuidinfo(int logfd, const pmchdr_infohdr &infohdr) offset = 0; while (offset < len) { - maxleaf = cpuidinfo->cpuid[offset]; + maxleaf = cpuidinfo[offset]; /* * In x86 the roots contains the maximum leaf number present. @@ -200,10 +200,10 @@ pmcview::process_cpuidinfo(int logfd, const pmchdr_infohdr &infohdr) count = maxleaf & 0x0000FFFF; for (uint32_t i = 0; i <= count; i++) { - cpuid[root + i] = { cpuidinfo->cpuid[4 * i + offset], - cpuidinfo->cpuid[4 * i + 1 + offset], - cpuidinfo->cpuid[4 * i + 2 + offset], - cpuidinfo->cpuid[4 * i + 3 + offset] }; + cpuid[root + i] = { cpuidinfo[4 * i + offset], + cpuidinfo[4 * i + 1 + offset], + cpuidinfo[4 * i + 2 + offset], + cpuidinfo[4 * i + 3 + offset] }; } offset += 4 * (count + 1);