From nobody Mon Jun 12 10:50:00 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 4QfpNm6lmQz4cdCc; Mon, 12 Jun 2023 10:50:00 +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 4QfpNm4zJ5z3K8m; Mon, 12 Jun 2023 10:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686567000; 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=g5I0m7v067CV1wI+ugYHHDTIqF8pmk03/7U4KTjkLpk=; b=T8JI9dfigmkeHcKKeamUTBg8Hlw1teeKXDeJgLAnOBihczlVVP0uxAx3S5mJk+As/c4jyw mzIzxb1qMY+arG0GgiYBVLaGpv9+Vcxio+hvw317Aiox24sr+O/V9MlozcOGQMkgXcjXCP R++0OHTLcEwwsjvxqqQr/eqhbAQaP4EI5guPzKXT774xFvP+m7PQ/bpbzn3qQ2FEww0VSI aMUXEzHSPbxQvsDhfwviM4+j7chanfcqMgsNI5mgr6xtL8HLxZghorTfpfz9rFotTvlcy1 DmSmM9LEpZ69FNtapTuhZ3KLznB0CSXhMWFT2GvhdR2ydzzy2a4UVPT1y5J8CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686567000; 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=g5I0m7v067CV1wI+ugYHHDTIqF8pmk03/7U4KTjkLpk=; b=fv9nYPY9deGx5z75tu2efWrkETmv8TwrJYhlHS0n+2p9SRvnKx6Gy29/KBPfTs07r7G5b3 R/+ulw2+VIWDDDPnTv0u3XrkK+3FnqmKU1EmLk80zA7DBvrULojJBtPSK4ho2mNBC7CEzQ WqyJgXqzF8k6epNcF9JpkQQSk6F46pN3NVLRt//CeWPBoO5ydueej2ko3cFNqLvLxkf4/k wjWQWn+PT+KPE8HzMvabMo1E1uT2EyEdK2F4vSK5Rj2KCQVWMu4zLw7LUAOFa+9eoUF3Xu DEWaPvZRz4T19XUZ5rKK3GPeJsaFBapAqvZrPD+yv41MpXQr6bwHsWynabVO0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686567000; a=rsa-sha256; cv=none; b=st9JNoCAJ2Ftp4xB2+Zz19xcbSs3DVQN9X8a18aTdnoU9+QIH/btfCTdr66DhkEpRRVtW9 CkVuLWalnadt5KBwe6lYFqXqje7DJlN6c60Z386FU+h/Ff7E9BseAHibncaGOxhc92igQA JHz62KDOZUA6FxHV7Dvd03I9dB+H4zgRnTo5IfmC05Mn6jp+scel+7oXxClaD5eL9iKR5H 1a/6y57nzm3RsmR+CadJbc7fxZs4QkS4TDw7hbqIqPHX+Bhz5cjVrKQvmx3fo1dM8W7Eet bPnbi0TZrbI7zmWo/N6lKCVNzT4RvcQ6W2uMtVAOxeWxw0KkAZ4zwlyU8fwMnA== 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 4QfpNm42GlzcZW; Mon, 12 Jun 2023 10:50:00 +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 35CAo0sc084465; Mon, 12 Jun 2023 10:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CAo05M084444; Mon, 12 Jun 2023 10:50:00 GMT (envelope-from git) Date: Mon, 12 Jun 2023 10:50:00 GMT Message-Id: <202306121050.35CAo05M084444@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: bb1770105022 - main - bhyve: Remove vestigial support for setting max vCPUs. 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: bb1770105022e7d65bef0f32988c08ee9676b68e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=bb1770105022e7d65bef0f32988c08ee9676b68e commit bb1770105022e7d65bef0f32988c08ee9676b68e Author: John Baldwin AuthorDate: 2023-06-12 10:47:35 +0000 Commit: Corvin Köhne CommitDate: 2023-06-12 10:49:49 +0000 bhyve: Remove vestigial support for setting max vCPUs. The kernel part of the hypervisor is not going to support per-VM maxcpu limits. The topology is only used to control the values returned by CPUID leaves for which max vCPUs is not relevant. Reviewed by: corvink, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37176 --- usr.sbin/bhyve/bhyverun.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index df9e1924a525..d56a1575e65d 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -282,10 +282,6 @@ topology_parse(const char *opt) set_config_value("cores", cp + strlen("cores=")); else if (strncmp(cp, "threads=", strlen("threads=")) == 0) set_config_value("threads", cp + strlen("threads=")); -#ifdef notyet /* Do not expose this until vmm.ko implements it */ - else if (strncmp(cp, "maxcpus=", strlen("maxcpus=")) == 0) - set_config_value("maxcpus", cp + strlen("maxcpus=")); -#endif else if (strchr(cp, '=') != NULL) goto out; else @@ -1135,8 +1131,7 @@ do_open(const char *vmname) exit(4); } } - error = vm_set_topology(ctx, cpu_sockets, cpu_cores, cpu_threads, - 0 /* maxcpus, unimplemented */); + error = vm_set_topology(ctx, cpu_sockets, cpu_cores, cpu_threads, 0); if (error) errx(EX_OSERR, "vm_set_topology"); return (ctx);