From nobody Thu Aug 17 13:29:33 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 4RRQpP2fwJz4qgHx; Thu, 17 Aug 2023 13:29:33 +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 4RRQpP20Qvz4jYW; Thu, 17 Aug 2023 13:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278973; 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=eW4keyDRKKjDpuvBQrnfYv0dJsUgLOsS18lyN37WS/4=; b=Fw3jocyS5zVMhYbLI94ZZKLHEpBWJPiIZBQDEaPXAHSx66yHFGwQCwaZtK1m47V447NKhy 8L61nqQGtGOQMI1iWVFdchNe97Rty76VZJpqvmc5rTLY571BkQRPE5sKUHS5VqLJVPWVja 3NZGxENQ5hlboCZs247m5IFe92TzOqU5gcwvcJvThSMOXjTy2lU0ZJGoTZ/bqJxO/X3Z9R HZcreNiKlYK7KGtiJzREm6JXDeT3xZX6DwgFHY72BtUAxGh7sQrTe16IwBRDxUf1+xJuSa zLRyzP7JX/pPofYHOwiLFEMYldpyh2/9YdRCFzZXAgm0hR12//rZ2QDuaPAFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278973; 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=eW4keyDRKKjDpuvBQrnfYv0dJsUgLOsS18lyN37WS/4=; b=O80N2d7h+LyBGVyHhMjsjqDgfMcLKhVjI6nqH8D/nyElpn+zMsN3jw09pS8xHBOc9WQGgJ X/9AnXgrRgRvbYAbYlFWdVEDFzgjN4wTVBGOxRdvOIlddKGpjqcKAlU3VDSsjB9MazIR/y dTN8qhq4Nie5105F2gy/mxnulZo69C7MkzGfFj0FEVhgVHM/9Cs3hDPM9j4E7+f1k7QBRs zLZH3qRjeKuiuRi6CSNh8QUVn00RsrQPnqCNt67pkT9nOh0atObTSdZaQPBZuVDX41OvaE y69n2xdCkpfq2lEnvSHYXKRKOAajEWeGM3YJKD+LMEVzxC7nyplbkiRFKleP9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692278973; a=rsa-sha256; cv=none; b=k7zKSAshjkqXJYJOuBbqyooorphdF/iB6JMb0ycSUoBZBbGlP5PQw/5gevOBt4p1i5gUWr LJFCM8YMqN2zV/PdvoBvSc92Cgl6fY/+9+00+Dm9KCHoEJ3sqF2aJysOtmKT29pPWg3lIG 3jYvN7oGz5vjw3QLbXmwzN7EFmk8QPtd954fzTmdmXwE5clcXLNuQbtGMfUjM+d4irvto9 qsn7TmxOsn9eLdrVVDmahekVbcpbrE3hfdeD7GcxxfLGNKFxZBX6kEIM5JKwWD7kMKXVhm nDi/BG3Ih4C31vvDWzAMhwnA7x9959BYeJRddeRp74HneAFcXV23KeqN9z0AMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRQpP0ylyzZyh; Thu, 17 Aug 2023 13:29:33 +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 37HDTXl8030713; Thu, 17 Aug 2023 13:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HDTXQJ030710; Thu, 17 Aug 2023 13:29:33 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:29:33 GMT Message-Id: <202308171329.37HDTXQJ030710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 320ce3c3c56b - stable/13 - bhyve: Remove vestigial support for setting max vCPUs. 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: 320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 commit 320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 Author: John Baldwin AuthorDate: 2023-06-12 10:47:35 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 13:06:51 +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 (cherry picked from commit bb1770105022e7d65bef0f32988c08ee9676b68e) --- 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 14a4eb9cabec..63ca9439d6e6 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -293,10 +293,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 @@ -1136,8 +1132,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);