From nobody Tue Jun 11 13:12:56 2024 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 4Vz8HD2R7bz5Ldn9; Tue, 11 Jun 2024 13:12:56 +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 4Vz8HD1X0wz4d8J; Tue, 11 Jun 2024 13:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718111576; 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=MeEiukgf7ec9yqhbjHV1RM4cCw8WR9KtPHiqY20lbN8=; b=F3NCAQ6ZRBuV88QM/geIq0BOQAclj6KjuLld7qKpp9CSwuAuQaofpwWuyDOgj1MkSbFd2H 0rtT3uI5QdQwqlS+S/Te9YiWnboH1QrJm67EQGM/ujmnYskIF1MFfoFLqAsrcvxfExgGOZ M8R2jNayJYIHh+MJNnQ13lxlpYfzrRs0ZoiX65VTiIcGgoyjEw7z7Db1pK9Qt69P+Xvjer 3c9qXfrYkrmT/7VFve/N9x+G53kcRrVnf6vuR48B5AzmL02CW8dNJu6Gi6DCqxigO4jm9k guJWh7E5RITF49qiwg0JHx+8lPp7TjsI25V0pgu3hHyueErCAwz1cu+MuEX9dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718111576; a=rsa-sha256; cv=none; b=jKUlOBd+rKLbiNEQM3ujvZ7of2qF51ZpUo2NCjRaVjMjL/LoXh4qDHCCz+Ecjui1QvikOC njBs6LyEOCTZnkbst5CZgXZPq645bT9L67bhFTJ1M5HAgI1JFuScTQD4FhKQkzPtw/uCCW lV7fQuJp0o7vE1vXryWBwMM8Ax9SWcxaF9/Bfe8Wqqhq46VaSZK7WzpCP+L/nJEdW4qGSG T19ar8jHO4zNtCLtQnv2hc3+cV/SPi2AE6yFHQYpNYwkDfEvlzG0ZeaY9Qdpw8LI9+rPHF d2hC9lK7WvG4E/+G28Byc7TLGhi9iCxgyG37/21TXStzK0RB9hiAsXrHg6PrVg== 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=1718111576; 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=MeEiukgf7ec9yqhbjHV1RM4cCw8WR9KtPHiqY20lbN8=; b=NESnECreFea3SK4bjXaSuNP7a5Y+mfsopuh2dvh0cdGNMk9gau7dRT4MJW93X66hbtO9Ov u6BlU1ltjp7uVFItEgdLe31C7VGkOx/kWi2Av73CnwphCbpLeiWyAuzFRrLFikDyA8yMWN n7NtoGsd3+ogb7aHXKxYG7HwFy6FHUbPowc9KftM/0Dt9eo1Rqlj9k756GyBO9iktPMH4K mn/ES7iCUGu9tnfzhhdIDUMi9xLGGkIvaz2eZMOlszE2uMvOk9ESChpvzBO2G0qfFi3nTC 8AWbBMRr2RS3jN/YsIFPhHEhORbQZucedNClO5HCKOc4ZjEMAtgr1TGGuJJ1qA== 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 4Vz8HD17Nfz19Lc; Tue, 11 Jun 2024 13:12:56 +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 45BDCuP5054730; Tue, 11 Jun 2024 13:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDCuMc054727; Tue, 11 Jun 2024 13:12:56 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:12:56 GMT Message-Id: <202406111312.45BDCuMc054727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9a4813e1dc17 - main - bhyve: Fix the build with gcc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 9a4813e1dc1781d952d8db017fc7cc005095c6a0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9a4813e1dc1781d952d8db017fc7cc005095c6a0 commit 9a4813e1dc1781d952d8db017fc7cc005095c6a0 Author: Andrew Turner AuthorDate: 2024-06-11 08:49:32 +0000 Commit: Andrew Turner CommitDate: 2024-06-11 13:12:43 +0000 bhyve: Fix the build with gcc gcc doesn't like const and static to not be at the start of a variable declaration. Update the gdb_regset arrays to make it more obvious they are arrays of struct gdb_reg and to fix the gcc build. Reviewed by: corvink, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45550 --- usr.sbin/bhyve/gdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 6df8026a0245..a13166e1e2c8 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -166,10 +166,10 @@ static bool gdb_active = false; struct gdb_reg { enum vm_reg_name id; int size; -} +}; #ifdef __amd64__ -static const gdb_regset[] = { +static const struct gdb_reg gdb_regset[] = { { .id = VM_REG_GUEST_RAX, .size = 8 }, { .id = VM_REG_GUEST_RBX, .size = 8 }, { .id = VM_REG_GUEST_RCX, .size = 8 }, @@ -212,7 +212,7 @@ static const gdb_regset[] = { { .id = VM_REG_GUEST_EFER, .size = 8 }, }; #else /* __aarch64__ */ -static const gdb_regset[] = { +static const struct gdb_reg gdb_regset[] = { { .id = VM_REG_GUEST_X0, .size = 8 }, { .id = VM_REG_GUEST_X1, .size = 8 }, { .id = VM_REG_GUEST_X2, .size = 8 },