From nobody Sat Dec 13 09:30:00 2025 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 4dT1J902NWz6K4WC for ; Sat, 13 Dec 2025 09:30: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dT1J86PJZz3bXM for ; Sat, 13 Dec 2025 09:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765618200; 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=VBF+Jua6Bk5+kl3f2M/dIuMRfQV5Kv75X/pH4BzWeMQ=; b=b19x1cW8x5vnzJt0hKEDF3UcxqQd6r8r2xvYx/XO+vRt1gTYvwP0jWT5125yHWIaiZECDM yUIZyEEhxLEau7ab+Ih2Mo6DFhP2Jrwc6jzGi3xY5XQ2VUpviX8NNTTITn9U9CbapT2PCr uE1atzdlcqj9C9pVc0DSU026gUh/hfXN7/LsLyxByqjBk9zfdbRgqfkx4ZENcO4VX9mzeg RPhZNo/XZUIPyCbrITK7G8n3A3UdAEMs8s/UfbQon6F7ydhEdOf80m+8MJZH2zZQuFrTeq bRFzX9ZDL3K5sg2tCCVAbMGUy7Lcti1v80WCSFeirijBmcolT7B27MU1AnY3qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765618200; 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=VBF+Jua6Bk5+kl3f2M/dIuMRfQV5Kv75X/pH4BzWeMQ=; b=YYs1pWARjvRMP9z/eB3J8TET03IdgAAD+isdKztJn/kzTs5mLWBmTeiL9DF509/FN4g7yT WA9OXQqh/CBBdpYnNd83hF0bR0F5rGmIdvHqwjEEEZJ0uGvonSPLAiOtoHSqviFV+9YY0v LSl2lgY1BDLTQwNn0TpSPCe9SyLq88gRro34VnTGkvpF/s3gfARSDKFj23EtyV69TUKFwJ 49lYkejUwhgv3BuIg0OAJ9SF/KPV1spWEHuqXVIJ/N3sdxmugqE3Px44Wo33iZ+/n3Pw0c BBwxDSaa26fsEpSI8H+VJGADSU7wciYe+TKBAVWBeaMew5rZdryA84BUShP9ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765618200; a=rsa-sha256; cv=none; b=nBPHEoj1HYlG3P3uK5pzcvSq99pg6LUuNd9tXYvI1snOVkMhCVti4fxXaPi504Ts1NaWuJ rr3nOXkb9YQ6FAejg417ZN0qeLRcT9uvW+i5t3INFauJRGRcPz7AuPmosFSAdgr5Eom0Vq +rcohAD8BHiH0E2KNuNvmwq5Y2ElDjMaWUkvlh2/wI06yLdacVdz4Ce6uJxqaeb35hp2jW jEhhevyz2zf9N/T7o/XQ6153QkloR+B3P404MWdKWu4/B0FCSSsmF47c0mi24iAfAZbbM+ SgS8wTrhkn0idr2UWEMIC3Gh5RwQsa39WaDxhuqkltTjvPpY1NQgqFxGiwwUJA== 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 4dT1J85vGpzxDZ for ; Sat, 13 Dec 2025 09:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 315da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Dec 2025 09:30:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: 148111d3775e - main - bhyvectl: improve options error handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 148111d3775eb159d71a36e3a8b4c5c1bf53392c Auto-Submitted: auto-generated Date: Sat, 13 Dec 2025 09:30:00 +0000 Message-Id: <693d3218.315da.421f44e1@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=148111d3775eb159d71a36e3a8b4c5c1bf53392c commit 148111d3775eb159d71a36e3a8b4c5c1bf53392c Author: Roman Bogorodskiy AuthorDate: 2025-12-05 18:45:03 +0000 Commit: Roman Bogorodskiy CommitDate: 2025-12-13 09:27:00 +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 --- usr.sbin/bhyvectl/bhyvectl.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 41055678ac30..9e845ac6b531 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) { char *vmname; - int error, ch, vcpuid; + int action_opts, error, ch, vcpuid; struct vm_run vmrun; struct vmctx *ctx; struct vcpu *vcpu; @@ -338,6 +338,7 @@ main(int argc, char *argv[]) opts = setup_options(); + action_opts = 0; vcpuid = 0; vmname = NULL; progname = basename(argv[0]); @@ -388,6 +389,14 @@ main(int argc, char *argv[]) if (vmname == NULL) usage(opts); + action_opts = create + destroy + force_reset + force_poweroff; + if (checkpoint_file) + action_opts++; + + if (action_opts > 1) { + fprintf(stderr, "mutually exclusive actions specified\n"); + exit(1); + } ctx = vm_openf(vmname, create ? VMMAPI_OPEN_CREATE : 0); if (ctx == NULL) { @@ -508,17 +517,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); }