From nobody Tue Apr 11 07:31:24 2023 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 4PwcwF0Lw4z44KbF; Tue, 11 Apr 2023 07:31:25 +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 4PwcwD6g32z3nnT; Tue, 11 Apr 2023 07:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681198285; 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=dwi7zvDZn+tY5tL9JG0KsJKA0KRQcvUHDT6XQNRxfF8=; b=XPnT06lyegZRIo19fKXc08pw7LdL/66rLWoAptD2VmmyVEbTupnOdzAbqX0z/mLYPPjaz8 QdAuF7A7iVpdEVhim8xfKamUfn0AOElER9nYHOcclxffOaugSi7kcBv/7k72fKcJcyClFB 8Wu+VR4S/NsEgtNEwtS7Zn/hgrVp6abq006ewMXiGuxoIMPqNiVonWWR+NRpbzJ9NxuJg8 jN5moagrYX9cJilpbxsRzFLZW+7DHAKZVmt3m9E3UMLqwCfUApDXLj2ogrk3Qcx40tgY0+ qp2DjGUFvldz0cdXPKhHMD7nBMXE4wp7s2ED19EvjWUeIocOc49A8OAcGDBAAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681198284; 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=dwi7zvDZn+tY5tL9JG0KsJKA0KRQcvUHDT6XQNRxfF8=; b=kjg/G1vENnwE2vPE0PW8qwHNX37z9DsKd6DLh4CB+HzFvhUEVsV5ND6mbnnbcRhRQNZEYb xs1A7k8oX0AVb3TMKCWx9gPl8aL2XCnWTJ1UExM4ooveGiyxrcG6HRTrGp1b7Q+BmerQMq rLmV9SYjfKQru98F6pruYCBm/pUApKd9KlKFZbPG2M7qxAgUXbGtsghKIXwLSHAdBvsFXc AkNTlf10JviGdBvlgboUFkQYnqg0aJKzPBLbg5vebR7hp8Qu13G+UQ9IPzJlyg1TAqui+U vlBBWSp+GhDxlPCMZS1N/cJXneF2tFHSiba04cW5noSoL/ILZXt0t/FXL9SsgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681198284; a=rsa-sha256; cv=none; b=BEd1V6VjGFue80f9Py1heSsOr/N12NmItnu1qJMbxRpZp0ME+cEhR8Fhtxfl7QYW+WQWZL uJHKJLTv0QFougmnulkk0gaOtlkX8vglUywnBNYIZTP+lL2hPFajE57reVtGRu4qsiwTLF j3kx6O/2WuXevOyezwnLMZaAzpqVpznsws9jmKM/2bepRv+bkNTB+OT9xNGA2VXQJX8yIU +3hR7Qx3uZw53w28ddfbz2LfU6b7473ujLkKakHBoku2dWEfcZhKGjCwcgl3hflpMZpszJ d1RsGM/iLoLTOLVTWLbTAP0F1vYZBeCQCFix/Sg+hHfT8WPGEeheW9gPKNetGQ== 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 4PwcwD5n00z1NN3; Tue, 11 Apr 2023 07:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33B7VOf6035429; Tue, 11 Apr 2023 07:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33B7VOp6035428; Tue, 11 Apr 2023 07:31:24 GMT (envelope-from git) Date: Tue, 11 Apr 2023 07:31:24 GMT Message-Id: <202304110731.33B7VOp6035428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b0efaef285d6 - stable/13 - bhyve: add QEMU_FWCFG_INDEX_NB_CPUS item 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b0efaef285d6f154a3994aebdc722c81b8aab7c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b0efaef285d6f154a3994aebdc722c81b8aab7c1 commit b0efaef285d6f154a3994aebdc722c81b8aab7c1 Author: Corvin Köhne AuthorDate: 2022-06-27 09:05:42 +0000 Commit: Corvin Köhne CommitDate: 2023-04-11 07:29:54 +0000 bhyve: add QEMU_FWCFG_INDEX_NB_CPUS item Requested-by: OVMF (qemu) Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39316 (cherry picked from commit e46be58cca6bd180dadfb36e98a673ae6d8d2cd1) bhyve: add missing include to qemu_fwcfg.c Fixes: e46be58cca6bd180dadfb36e98a673ae6d8d2cd1 ("bhyve: add QEMU_FWCFG_INDEX_NB_CPUS item") MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 76fa62b5232e67ef10476cf1329aaceb9cbc2ff5) --- usr.sbin/bhyve/qemu_fwcfg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index bb86d0371985..a93b37027142 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -16,6 +16,7 @@ #include #include "acpi_device.h" +#include "bhyverun.h" #include "inout.h" #include "pci_lpc.h" #include "qemu_fwcfg.h" @@ -42,6 +43,7 @@ #define QEMU_FWCFG_INDEX_SIGNATURE 0x00 #define QEMU_FWCFG_INDEX_ID 0x01 +#define QEMU_FWCFG_INDEX_NB_CPUS 0x05 #define QEMU_FWCFG_INDEX_FILE_DIR 0x19 #define QEMU_FWCFG_FIRST_FILE_INDEX 0x20 @@ -225,6 +227,20 @@ qemu_fwcfg_add_item_id(void) (uint8_t *)fwcfg_id)); } +static int +qemu_fwcfg_add_item_nb_cpus(void) +{ + uint16_t *fwcfg_max_cpus = calloc(1, sizeof(uint16_t)); + if (fwcfg_max_cpus == NULL) { + return (ENOMEM); + } + + *fwcfg_max_cpus = htole16(guest_ncpus); + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_NB_CPUS, sizeof(uint16_t), fwcfg_max_cpus)); +} + static int qemu_fwcfg_add_item_signature(void) { @@ -406,6 +422,10 @@ qemu_fwcfg_init(struct vmctx *const ctx) warnx("%s: Unable to add id item", __func__); goto done; } + if ((error = qemu_fwcfg_add_item_nb_cpus()) != 0) { + warnx("%s: Unable to add nb_cpus item", __func__); + goto done; + } if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { warnx("%s: Unable to add file_dir item", __func__); goto done;