From nobody Wed May 11 18:56:09 2022 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 119A01ACE7B9; Wed, 11 May 2022 18:56:11 +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 4Kz3yy4rQtz4dPf; Wed, 11 May 2022 18:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652295370; 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=JuW60yGhl1a3t8alVVcSpr9QkapiLvTuHXfUO6LfBuU=; b=XuvlKXmmFC6EsLK2J9DQ0eKTZx9hbdhMEr4GEtIiSBJewirgpO1vGKnY2JcG7xL4Ccw2t7 tKL4HWzLlkBIuXPxbiio+I9QhfBkdP6wzvwXC+2yT7MB+ZkLD/vpsNXGDNFx/HEL9PQjSv CB1dCMeq4dLze6pSdC5M9Pui/YLuILmqv+E+O7GJ+ghF9N64k0aPJgiaNVQ8kwQGf/TOWn 97wrZR74zP0kkf6Ra2JYF/NGNNpQhMkzqBqOgGU7zHr9R/ZAOghajVBFeXvwe7Y039dMFn 41Ii3BdwGBxL/rfl015YN3gJgLg6wNQQFo8kmVAbz7VEK5s/xaACJZ5fvditSQ== 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 23E7A1F59F; Wed, 11 May 2022 18:56:10 +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 24BIu9Bs049101; Wed, 11 May 2022 18:56:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24BIu9VB049100; Wed, 11 May 2022 18:56:09 GMT (envelope-from git) Date: Wed, 11 May 2022 18:56:09 GMT Message-Id: <202205111856.24BIu9VB049100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 27537022c5a4 - stable/13 - bhyve: Don't force an upper bound on vCPUs when parsing pinning. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27537022c5a4f3ae764c95e37a3700a65ef854a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652295370; 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=JuW60yGhl1a3t8alVVcSpr9QkapiLvTuHXfUO6LfBuU=; b=gBAle9Y8j9IA0fPjxjRHb4l1X9eauzV9mkCmmg2yWvISRnfZNMK+HUDxLL373blyTLFibh DmLexo43HKNqtC2dPZ+PBRSDEoyaqSGUGCB2bYrqVEPXD8UY/4dg3SapKRV9YCdvDl9LQn MIEVKF9GtkB8oK44zKnshIhK8abr94VlROYJ/69ca5D3dc4sgXBoc2VLH8iFMrnGN0ejok flzxqYxRdywIoF5ZiLZYGeS0IMZ4jfCX/WzZCehC7iwUa2S6VRkfOa0P8MKvEgWT1J9HRR nzoogOIAFaZNv9y5cAF+TF8Ig05WzISvGXhgsJvnWMTHJJVXovrUUO7Rb3ORjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652295370; a=rsa-sha256; cv=none; b=hA9kKqcdUx/kpI6epMXcQutCfmEKukFKgjM/f4cZlRxbUZc0YMJJu3R1T8F8qXwQKK8iQd 7K3EdamziPAFPRCC98J/9ZS9pUkadxArVV7kF+OTD5G+7XxxeSWPBOII+G7camYGW1oFl8 jCKKoX8y1WFHE3MzQk85B8fnMcZpoK/L7mFJhSJMhowYIRZVAwX/xsMKI4Gpf18xrSGG/d GD70Czt16dvBimxz363TP6CUVoiFRgVqAeWmJ9q4+wmufweZwRXfZle5hNq6lUR0mRBcbj yJ/kdmkFehQgFXqEDZzVbeQm1OM+i/RdtNmY7FbnDUSuV0lFdYkidxqNTnqDmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=27537022c5a4f3ae764c95e37a3700a65ef854a4 commit 27537022c5a4f3ae764c95e37a3700a65ef854a4 Author: John Baldwin AuthorDate: 2022-03-09 23:39:16 +0000 Commit: John Baldwin CommitDate: 2022-05-11 18:51:56 +0000 bhyve: Don't force an upper bound on vCPUs when parsing pinning. Even today it is possible to specify pinning for a vCPU higher than the configured number of CPUs but lower than VM_MAXCPU without raising an error. Reviewed by: grehan Differential Revision: https://reviews.freebsd.org/D34492 (cherry picked from commit fd6f92946f02b451c792bfdbc94259ff65e49969) --- usr.sbin/bhyve/bhyverun.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 43032b9f78fa..3a474fcdf270 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -392,9 +392,8 @@ pincpu_parse(const char *opt) return (-1); } - if (vcpu < 0 || vcpu >= VM_MAXCPU) { - fprintf(stderr, "vcpu '%d' outside valid range from 0 to %d\n", - vcpu, VM_MAXCPU - 1); + if (vcpu < 0) { + fprintf(stderr, "invalid vcpu '%d'\n", vcpu); return (-1); }