From nobody Tue Apr 4 08:26:21 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 4PrLSt0qzDz43Bjy; Tue, 4 Apr 2023 08:26:22 +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 4PrLSt0C2rz3l7d; Tue, 4 Apr 2023 08:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680596782; 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=WwkDL3wFqMc3R43HG+SelPR2pfxk+t1KB5JAfJJ79ak=; b=Yt6PrROSDtjL+WOTgajdRtrxaOnVrH+I/Btb2IyAjgStgl7speiFYt6NFOmNPGI0iAgZRc SbvDVX+B0dhykFPI/NK1YqqWQ/P1JKA1VM67ciZTSVSZcPu4ddYCjs59R3QQZyvfIROgTM skO+ED1J8H3Ac6sSS2tFSswfyKwgaJFI7zYnCGf0nij6BsbESwPNA+a4SLKmv1RI4px20f zVL83g7czUMQrYRaAGUpIJNr//dk0q+djhBMaDHxOkEGfVwfPpZkPE5FmN09fr9nrwfaFR E5BNR0WK2BDLK9TkiSv5oZPzhFnUksCuSUGQ8xjurzFKOue21do7RFOvEDFfUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680596782; 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=WwkDL3wFqMc3R43HG+SelPR2pfxk+t1KB5JAfJJ79ak=; b=E5tBAITWmEZfGX3imdGBj8Nyq7/FuwoEgWix95Q0YzKKmwPu3ajHULomFgTMG/hZ79z+VY egYlSmGs9GYURqVvmircvN8i4ppJgv11EjWTqajNjS7jLKXzTkkt/+C1nQp1zz1dVr2qSM 0Vj6ShsxObHh95wEZOGr5HDqmc9aej+dFzQFYQhKRP80gi0L8TWdeqU7gkGOxRH5gjZZ0M Tzt8pVG1GqNzwrUVPcM9sUYiPhUtpEQjOK3OGoJkgbKV9UMPTuLbvR020zZns9yemBPRXQ mafuZZy5sQ17En31ywlKF4djC2diYs9I7oXLLja1wfs7Ujf8aZsoEJPaxv02xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680596782; a=rsa-sha256; cv=none; b=qp6/EdfNsRA5WGYRJfdOetPUZ+oF7MxnyIAO3PXsmAD72+v3YHWBRNdesWWb0VjyAvckRq ZemIyOydKxpeuGrZDM3rWnsWRiQaeEBPlDnu3CWjkyhYVHxncXRVMBk1mgvwMTmg5YV0PW qxAHmki0FlVjrLnDSG+tD1h7JsbXTu0dUmSXjO9mLo36BjNRbbG5z4h3kzebX6BEJwVbXP 2WXy3NmKIJFkhce/LRhNoL1DL5A3VRPPfW2a+Ut/8iC2Et8MeujYMeqHIJBeJ/QXA/45UK DlPvZ3NQ5Bceyqp+MY4qPgpMFFkCv60e+uL57Y1GEiWLROA2pDEOg+sxk10Grg== 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 4PrLSs6FfHzY9h; Tue, 4 Apr 2023 08:26:21 +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 3348QLOC006833; Tue, 4 Apr 2023 08:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3348QLZg006832; Tue, 4 Apr 2023 08:26:21 GMT (envelope-from git) Date: Tue, 4 Apr 2023 08:26:21 GMT Message-Id: <202304040826.3348QLZg006832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e46be58cca6b - main - bhyve: add QEMU_FWCFG_INDEX_NB_CPUS item 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: e46be58cca6bd180dadfb36e98a673ae6d8d2cd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e46be58cca6bd180dadfb36e98a673ae6d8d2cd1 commit e46be58cca6bd180dadfb36e98a673ae6d8d2cd1 Author: Corvin Köhne AuthorDate: 2022-06-27 09:05:42 +0000 Commit: Corvin Köhne CommitDate: 2023-04-04 08:26:15 +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 --- usr.sbin/bhyve/qemu_fwcfg.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 1da0a42819b8..01010a64d3f7 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -42,6 +42,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 +226,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) { @@ -408,6 +423,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;