From nobody Thu Sep 28 08:50:44 2023 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 4Rx6dJ5XKlz4vlHx; Thu, 28 Sep 2023 08:50:44 +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 4Rx6dJ4m5Mz4T42; Thu, 28 Sep 2023 08:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695891044; 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=pNvAREPxgwVvAJC7R7jw2urx05HDgbOruLJjdrd34Ec=; b=yqCg/eNtFe5XpNKoVvq2Ee68iTLEPjkH9tmGfv569+DYHDF238UGSstKrpUxMFNtCu3Wx+ Ew4wlwiRhaJUwVzLSV6/830/qj+0OiPIAVdFEMOxKBgcCjIxGpxHU5yJDXk04yy2it8WMs p9+ARHjdeqw8W/z/yAXgFxv/ts5WWn1GDAg2U/NThAIZYdCxsKeEscKvLVdwgBp+AWlB5a W0U3MiNK3gl9SOmZ/DaTCkISy6rHbw+dDTGOOMv3UEJzmPhevyVYhVUshGpTsEWTtC16Lw gMql2e/KbMRKUCz/ztLtfVpeuSX1AUdeFdrU224so2CtPNWOLPLz28A8J7Heaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695891044; a=rsa-sha256; cv=none; b=HOilAh6MaBJnQh8gAyAFdlsIZFD39oTPrbCaf1cJ2nrQdQ4AvWF5EidQgYfnN5Sit4r1Sn qe3XYvQ8lcULJmjVlQAkQe3rd2pJAP7ZSV5ogrpspTXzkD/7KoY/2UAsumV8a5Ie9salzi g625zvWMenIDUfBzKBz5JX/IBoQcyLJuMe/5ebviSAoEqAfImSRqDGQtdHpcKNGFmo1jNF x2Z4+sxSyQbqGUlVb4o8nigh4VPra4PYN+7YupQQzj+E5PCdzGoAv4YI9j3DVJgnDJ2FQv Cj3B/aBRHmse0J1QltwVPXluNiHYwI+st6aODRhUWwIgbwhen3dWNc+dj/GZFA== 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=1695891044; 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=pNvAREPxgwVvAJC7R7jw2urx05HDgbOruLJjdrd34Ec=; b=Y5Rl/hF5sgpzb7tWPloI9CdNX2AblAAQ6weaVxplqII+HBbPi5DTmJQC47LENvnkqqT1Jk jzB5QeAuBWzbR6o3w6ap4G4s9XYg3vaaDXaJjKKDhDczALmo8ee4FLU8fjpSf1eLTIQjzE 34qw52wNzjwEf75yRsSccjGZpYG8NDe4A5mSTUea8qDBbB469ixH3Ehcx+EZqiPL+IqmBA bEYKqC6iMDWDf4zOzC/zPnUU8knREe4L57cF4K/xLdPHaR20+DrpVIzwg8Ktn3AYpaCwUF gS4rC/0vn5C3Yhvr/ktrNLGydRdek3g/JpbuqaFmfYkRpDXzUhaD5JpHcrb82g== 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 4Rx6dJ3Vr8z1KC; Thu, 28 Sep 2023 08:50:44 +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 38S8oiKe014642; Thu, 28 Sep 2023 08:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38S8oiw7014639; Thu, 28 Sep 2023 08:50:44 GMT (envelope-from git) Date: Thu, 28 Sep 2023 08:50:44 GMT Message-Id: <202309280850.38S8oiw7014639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6a0e7f908802 - main - bhyve: always generate ACPI tables 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: Sender: owner-dev-commits-src-all@freebsd.org 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a0e7f908802b86ca5d1c0b3c404b8391d0f626e Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0e7f908802b86ca5d1c0b3c404b8391d0f626e commit 6a0e7f908802b86ca5d1c0b3c404b8391d0f626e Author: Corvin Köhne AuthorDate: 2023-09-08 06:56:41 +0000 Commit: Corvin Köhne CommitDate: 2023-09-28 08:43:04 +0000 bhyve: always generate ACPI tables Most systems don't work properly without sane ACPI tables. Therefore, we're always generating them. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41778 --- usr.sbin/bhyve/bhyve.8 | 4 +--- usr.sbin/bhyve/bhyve_config.5 | 2 +- usr.sbin/bhyve/bhyverun.c | 8 ++++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 7eddeec4647a..f80dd54fc2c3 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -112,9 +112,7 @@ exit is detected. .Bl -tag -width 10n .It Fl A Generate ACPI tables. -Required for -.Fx Ns /amd64 -guests. +bhyve always generates ACPI tables so this option is obsolete. .It Fl a The guest's local APIC is configured in xAPIC mode. The xAPIC mode is the default setting so this option is redundant. diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 6904ad096c0d..1322abd67958 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -120,7 +120,7 @@ The value must be formatted as described in .Xr expand_number 3 . .It Va memory.wired Ta bool Ta false Ta Wire guest memory. -.It Va acpi_tables Ta bool Ta false Ta +.It Va acpi_tables Ta bool Ta true Ta Generate ACPI tables. .It Va acpi_tables_in_memory Ta bool Ta true Ta .Xr bhyve 8 diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 3db796c65a28..1d4cf048b59b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1201,7 +1201,7 @@ static void set_defaults(void) { - set_config_bool("acpi_tables", false); + set_config_bool("acpi_tables", true); set_config_bool("acpi_tables_in_memory", true); set_config_value("memory.size", "256M"); set_config_bool("x86.strictmsr", true); @@ -1240,7 +1240,11 @@ main(int argc, char *argv[]) set_config_bool("x86.x2apic", false); break; case 'A': - set_config_bool("acpi_tables", true); + /* + * NOP. For backward compatibility. Most systems don't + * work properly without sane ACPI tables. Therefore, + * we're always generating them. + */ break; case 'D': set_config_bool("destroy_on_poweroff", true);