From nobody Sun Aug 23 12:03:33 2026 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 4hSXkZ0vq2z6pGvW for ; Sun, 23 Aug 2026 12:03:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSXkY5YT0z3W3h for ; Sun, 23 Aug 2026 12:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787486613; 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=fkk8qvycxFqIsx2iRy/qFi5PU90kudXzxoRz8oL+Jz4=; b=RNbJo3yehQKgHASCrJZ6SHngzz/DeyTiOVYLUoHKeaLvnkeduFxDwpbxPUyr9jvPnyQzDi OJ4fAhAx5qXqqkCnWxDTtGqb/y4ffj/kIY1DIaVFwq1bJiL77JLnmutlvrP12nTz7B48Qe 2UXSx9p3hOFR/hTQLsQZYqfh7MDRDZhdLOxOdhqvZ0k3chq9bcHNk/sfgTlavg2596y5Jb b7cTN4GqIo4/ULtgPYz/BFgjnS4/KIFpKo83/DBityevVfjA0DD+3XUJWjvkNGmKAQ2og2 zUyq7vhLYNcNWMy+IKk7KmbHSp+CNyMDWZBB1AS2aWO207YbTKG03jzES6SrDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787486613; a=rsa-sha256; cv=none; b=uVOCxw9PAPam7CpBKgBR/hv++IIFq02RlpUTBXad4mms3SnCKcyLtKJF42gNJwjxnhCOz0 lJr0hTTuvE42C1RLR7y5mHbmDZvArnsTI8zQjjZOgyzluLsvxu5mVaJb9twrEIyaViSuUW dS14xiGqApenP8M7vW0/sEdrQJbd2BENxFUDmGnufQTpkMKSdXvroHZrjKYX6LEKwobvVu EdQ42nLG/r5/ddSH+QpP4ntd5IhWxn5PcHuaI5mDfNkF7ydRu8wqvbnHnZCfuI2fmQaA5i qVoQzJkf+jfXeQUH5E+VnwXHNX05zJCShP0h0cGgLP8FZQjKjQs39lu/8CuFEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787486613; 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=fkk8qvycxFqIsx2iRy/qFi5PU90kudXzxoRz8oL+Jz4=; b=yhAQvcXTPKTCj0GxGencUuvYVtOyN2kJk9zjjMRX6TLp2LbEEu3Rhc+gacGZlDoyryorXO 7NoTPgUzKMbfo5hZrFurkKUB/ghqLO4AOkdSP5WsL1Bx9P4tipuWZ9Y9F7KrIIEPVxuQQU mOo7RI766M8KlrxlfqqCtdyKuqZc5xmVNPyJzCcal/UqmLM46rQBne2GNe8DHMRB+9eD1/ 6KXs/HFhmfEUu6Rv/W3pkeJIeutYwMZRhnTZz5TWXqa5Jfnpme/mOlqVY5KDHLuiYGISY2 7qaG3Oe5CZAWu1hEwZcVw/k3lmFJtjFdybbZ2d/Rd3su5Yz+BQAurSLiDiLu+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSXkY3z14z1nM for ; Sun, 23 Aug 2026 12:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30c13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Aug 2026 12:03:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: f49f33ef8c53 - main - bhyvectl: Generalize bhyve IPC code 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f49f33ef8c5315ada2ec1a1ca5626d5608e4e6e0 Auto-Submitted: auto-generated Date: Sun, 23 Aug 2026 12:03:33 +0000 Message-Id: <6a8ae195.30c13.6d961535@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=f49f33ef8c5315ada2ec1a1ca5626d5608e4e6e0 commit f49f33ef8c5315ada2ec1a1ca5626d5608e4e6e0 Author: Bojan Novković AuthorDate: 2025-11-24 21:47:46 +0000 Commit: Bojan Novković CommitDate: 2026-08-23 12:02:50 +0000 bhyvectl: Generalize bhyve IPC code Move the nvlist-based bhyve IPC code into a separate function. No functional change intended. Reviewed by: rew Differential Revision: https://reviews.freebsd.org/D54652 --- usr.sbin/bhyvectl/Makefile | 2 +- usr.sbin/bhyvectl/bhyvectl.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile index e5c6ad18d286..8cfb1169e585 100644 --- a/usr.sbin/bhyvectl/Makefile +++ b/usr.sbin/bhyvectl/Makefile @@ -20,7 +20,7 @@ CFLAGS+= -DBHYVE_SNAPSHOT # usr.sbin/bhyve/snapshot.h needs ucl header CFLAGS+= -I${SRCTOP}/contrib/libucl/include -CFLAGS+= -I${SRCTOP}/usr.sbin/bhyve .endif +CFLAGS+= -I${SRCTOP}/usr.sbin/bhyve .include diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index b63cd5dc8c6e..ba2518267b14 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -52,6 +52,7 @@ #include #include +#include "ipc.h" #ifdef BHYVE_SNAPSHOT #include "snapshot.h" #endif @@ -253,12 +254,13 @@ show_memseg(struct vmctx *ctx) } } -#ifdef BHYVE_SNAPSHOT -static int -send_message(const char *vmname, nvlist_t *nvl, const char *rundir) +static int __unused +ipc_send_message(const char *vmname, nvlist_t *request, const char *rundir) { + int err = 0, socket_fd, ret; struct sockaddr_un addr; - int err = 0, ret, socket_fd; + const char* errmsg; + nvlist_t *reply; socket_fd = socket(PF_UNIX, SOCK_STREAM, 0); if (socket_fd < 0) { @@ -286,18 +288,27 @@ send_message(const char *vmname, nvlist_t *nvl, const char *rundir) goto done; } - if (nvlist_send(socket_fd, nvl) < 0) { - perror("nvlist_send() failed"); - err = errno; + reply = nvlist_xfer(socket_fd, request, 0); + request = NULL; + if (reply == NULL) { + perror("nvlist_xfer() failed"); + goto done; + } + if (nvlist_exists_string(reply, "error")) { + errmsg = nvlist_get_string(reply, "error"); + fprintf(stderr, "%s: IPC command failed: %s\n", __func__, errmsg); + err = -1; } done: - nvlist_destroy(nvl); + if (request != NULL) + nvlist_destroy(request); if (socket_fd >= 0) close(socket_fd); return (err); } +#ifdef BHYVE_SNAPSHOT static int open_directory(const char *file) { @@ -329,7 +340,7 @@ snapshot_request(const char *vmname, char *file, bool suspend, const char *rundi nvlist_add_bool(nvl, "suspend", suspend); nvlist_move_descriptor(nvl, "fddir", fd); - return (send_message(vmname, nvl, rundir)); + return (ipc_send_message(vmname, nvl, rundir)); } #endif @@ -345,8 +356,8 @@ main(int argc, char *argv[]) struct option *opts; #ifdef BHYVE_SNAPSHOT char *checkpoint_file = NULL; - char *rundir = NULL; #endif + const char *rundir = NULL; opts = setup_options(); @@ -406,6 +417,9 @@ main(int argc, char *argv[]) if (vmname == NULL) usage(opts); + if (rundir == NULL) + rundir = BHYVE_RUN_DIR; + action_opts = create + destroy + force_reset + force_poweroff; #ifdef BHYVE_SNAPSHOT if (checkpoint_file) @@ -546,7 +560,7 @@ main(int argc, char *argv[]) if (!error && checkpoint_file) error = snapshot_request(vmname, checkpoint_file, vm_suspend_opt, - rundir ? rundir : BHYVE_RUN_DIR); + rundir); #endif if (error)