From nobody Sun Jan 4 10:29:00 2026 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 4dkYZ50RxLz6MqTk for ; Sun, 04 Jan 2026 10:29:01 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkYZ45GPBz4H4r for ; Sun, 04 Jan 2026 10:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522540; 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=9FRJGSV5y5B+ewdcbFw95KigO9KJ5G/trwk/UekY/2c=; b=NzVvbgNiZzdgEaIMex9iK5Q1oozwfhEBILSZuBO1cIhmuBBtttJp/IdYODfeN1sWruBZOA nnYHDZFJwk5NrvRpkPA/c3OmMYPdt0mztB2DF0a7FOD9SgHED+06KV1N5afGqVQLy6N/aQ WUMEP2P/1NwmshO8aWySXqdv798rEGYraf/8H82RWtsDbkc/tbSw5YziNbgXjPrtSFMLtY dJ/aXcGbx5ID5lRT190TvQrE4a8tPuB/FbKZjb7a7ZQUsHJWKRuCxl49hakZBLcfm8ivUX GCKnCnK3N8mp45tRv+WvEgujrsbFzES3WyO+G8l12Im3QlIF2ohc4IX7tL+Nlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767522540; 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=9FRJGSV5y5B+ewdcbFw95KigO9KJ5G/trwk/UekY/2c=; b=vVmgd776pzZzCWkK0esmAD8FvvNb+OliBwQLf212WUCxJLNE1NZTND4R+7KKcl9FdmRejF HCURg8IbnGtMR2w2q2tJ1r0tZxPVR70WH9YR5zwjQuO28uS+qmO85fqRpicTPWGcV7pjbE JGMBoWC9LNED/Rn1ozUBQ/PkfHE6n0ZV/3QsdJ3KojchmD688z+SKQ1veDIRYO5umJM5yi AadmV2E6ui1zphK93Z3NmacWuHkaXUbuuMsGI4eDcbggXQwqArRNNIKCGlrvOoP1N3SI20 Nnhdf4OI/ZMPcC5rDyJwBQ+3cRHtfkjB79M3tg0wAyll9NbSsqOX4N7FOiMeIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767522540; a=rsa-sha256; cv=none; b=Q1HwxYR2Xg39I2u/V8wzfmY2CeBJeM9BNp/FQ4vtkxTqmVnvsXwN166ox5jlIJJvmhQMo8 2ZnXTbZO46Jj8rq/Rj708AkO/CJXv9Hg61GWwQnbyZBpw7cNGCx8BQR9dVKH7mcRZ63ysC 9QkVUkavcqvB2BAaRNkUxgnZZMeAb8nfAcDm/uErdzSm7X/FO4l6YuVDe+52d1hVJzH1b8 XErl9fq8BuWf7lnNKjEiCPlMh/7zo/6n/84F6ed/HZqnr0UUvkqa4uUeYmC+dYC/wHHjiB QwtuTgBpcIB6YXUOZfqxHG9s/enMEfIGu54EbjPSJn+CiRDerb7L7GzjBnjapw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkYZ44dTvzVLn for ; Sun, 04 Jan 2026 10:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 10:29:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: b35e955333ef - stable/14 - bhyvectl: improve options error handling 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b35e955333efdd97a3a369740d2b2038fb86826c Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 10:29:00 +0000 Message-Id: <695a40ec.20e98.3527639a@gitrepo.freebsd.org> The branch stable/14 has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=b35e955333efdd97a3a369740d2b2038fb86826c commit b35e955333efdd97a3a369740d2b2038fb86826c Author: Roman Bogorodskiy AuthorDate: 2025-12-05 18:45:03 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-04 10:24:47 +0000 bhyvectl: improve options error handling Currently, it is possible to execute bhyvectl(8) with mutually exclusive options, such as "--destroy" and "--suspend", and it will print out obscure errors, e.g.: bhyvectl --suspend=/var/run/vms/my_vm --destroy --vm my_vm connect() failed: Connection refused Address that by failing early if mutually exclusive options were specified. Additionally, move the BHYVE_SNAPSHOT block before the errors are printed, so its errors are also displayed. Approved by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54092 (cherry picked from commit 148111d3775eb159d71a36e3a8b4c5c1bf53392c) --- usr.sbin/bhyvectl/bhyvectl.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 050d72f013df..acd4950e10ca 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1628,7 +1628,7 @@ int main(int argc, char *argv[]) { char *vmname; - int error, ch, vcpuid, ptenum; + int action_opts, error, ch, vcpuid, ptenum; vm_paddr_t gpa_pmap; struct vm_run vmrun; uint64_t rax, cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7; @@ -1648,6 +1648,7 @@ main(int argc, char *argv[]) cpu_intel = cpu_vendor_intel(); opts = setup_options(cpu_intel); + action_opts = 0; vcpuid = 0; vmname = NULL; assert_lapic_lvt = -1; @@ -1822,6 +1823,17 @@ main(int argc, char *argv[]) if (vmname == NULL) usage(opts); + action_opts = create + destroy + force_reset + force_poweroff; +#ifdef BHYVE_SNAPSHOT + if (checkpoint_file) + action_opts++; +#endif + + if (action_opts > 1) { + fprintf(stderr, "mutually exclusive actions specified\n"); + exit(1); + } + error = 0; if (!error && create) @@ -2290,17 +2302,17 @@ main(int argc, char *argv[]) if (!error && force_poweroff) error = vm_suspend(ctx, VM_SUSPEND_POWEROFF); +#ifdef BHYVE_SNAPSHOT + if (!error && checkpoint_file) + error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); +#endif + if (error) printf("errno = %d\n", errno); if (!error && destroy) vm_destroy(ctx); -#ifdef BHYVE_SNAPSHOT - if (!error && checkpoint_file) - error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt); -#endif - free (opts); exit(error); }