From nobody Fri Mar 18 05:24:56 2022 X-Original-To: dev-commits-src-main@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 5F3361A254E2; Fri, 18 Mar 2022 05:24:56 +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 4KKXWr29szz4Zqn; Fri, 18 Mar 2022 05:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647581096; 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=4hjkRKINH2Tqm/WzvDUG2Wpr8tKaoSohWoMXFFIsECA=; b=gEMkZl3N2c1+B1Mlwdu0jAHq9pIpHRyF257zUhiqxYSdyNHeq+7gProNSxfb7puPh6283B /qg7uBFX2qExcg2dMskRbUZgtxNCOpISFklHuGWBN16JVYhu5IzplFKbVHOaC2iz4hSRw/ N4UjrcaZi+QbRAzCQOwL00GmmGMBO0NWVKoaKdHpzRyO+Mf6ZA5gS528QnzCug5ZyurOHN fJdGiHPCudx1lUzlIloTFfiykTxN/+zj+qhCNPY97MYwMZFrxqN3ZxeN7VaQdifBHpr3by 0arRlAe2ph1YcpqSvatUaGt0cEgbldId7VlGmMWflrN+YJd+TxwrgFGLFkGhHQ== 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 2740819072; Fri, 18 Mar 2022 05:24:56 +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 22I5Ou40057114; Fri, 18 Mar 2022 05:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22I5OuuI057113; Fri, 18 Mar 2022 05:24:56 GMT (envelope-from git) Date: Fri, 18 Mar 2022 05:24:56 GMT Message-Id: <202203180524.22I5OuuI057113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: ee0ebaa42028 - main - bhyvectl: drop vm_get_name() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee0ebaa42028aee9886e06b6b995c8b2389e89f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647581096; 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=4hjkRKINH2Tqm/WzvDUG2Wpr8tKaoSohWoMXFFIsECA=; b=KE+Cxry1OEt8clAn/qSiqa+0k9KpSU8jrCPdtefF3qWYA1GhbIMdEjMiwrbXsMhTkSFtVh dql00NAP63+4RVVodxuU7qnF0dhLTwbE7AQL5HEIkdg5s4LLRIHGyVx0qInuptVnA2NHfe 5sHG+M1KyW5lQr6JSFuaBHkfA96fQAgnI0vTcHjUujm8NyMJrJubaJE86AY9za2+yW8TYu mSnxIMKQA95PyKeeCQmjWUqlQgPyGyOwIiEzzKAONdcA3YlwGTL7SgIDIjUO2HfK8rK91Q NBneVIV7unj8MXhjZzbDG0gNEq7Gi8pIlFgQ5m/CtygHXBpNBftyd51thSThJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647581096; a=rsa-sha256; cv=none; b=TQwY/zhsXwMsGvy/E/y5MZVPNnVCKjp8nEpXn4R6/R13YaLzrYvSTNv21Zo/f46qaDMFn1 XinUKJ1ySmrhZuSxfv4mT8hUwmrwm49NQ6KajxNUnMFdFl/rRS6iovOgCiz6fiADbTg+qd ZtYtsWsUuNV/Yl4BUOsweByY+xXfHRdnJzzXXPMfL1JWFWlb1D4mbSsH5OxPP5OVVHzq4N UmfQYgWpeGkE+HFQmJZEr3zjNjOJ+BPjOIu7Um7f/uaelDUD36owxBwStn8fnhOIFpwl7d TqaJJA9qgWcGAJqaq1mvfOKdomSDPTrJ6ozobP87FicgjVLj0YaSu5goo72LDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=ee0ebaa42028aee9886e06b6b995c8b2389e89f4 commit ee0ebaa42028aee9886e06b6b995c8b2389e89f4 Author: Robert Wing AuthorDate: 2022-03-18 05:22:43 +0000 Commit: Robert Wing CommitDate: 2022-03-18 05:22:43 +0000 bhyvectl: drop vm_get_name() Grab the vm name from bhyvectl's --vm flag instead. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D34399 --- usr.sbin/bhyvectl/bhyvectl.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 0480e1623621..e4de6da1803c 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1684,11 +1684,10 @@ show_memseg(struct vmctx *ctx) #ifdef BHYVE_SNAPSHOT static int -send_message(struct vmctx *ctx, nvlist_t *nvl) +send_message(const char *vmname, nvlist_t *nvl) { struct sockaddr_un addr; int err, socket_fd; - char vmname_buf[MAX_VMNAME]; socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0); if (socket_fd < 0) { @@ -1700,13 +1699,7 @@ send_message(struct vmctx *ctx, nvlist_t *nvl) memset(&addr, 0, sizeof(struct sockaddr_un)); addr.sun_family = AF_UNIX; - err = vm_get_name(ctx, vmname_buf, MAX_VMNAME - 1); - if (err != 0) { - perror("Failed to get VM name"); - goto done; - } - - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname_buf); + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname); if (connect(socket_fd, (struct sockaddr *)&addr, SUN_LEN(&addr)) != 0) { perror("connect() failed"); @@ -1725,7 +1718,7 @@ done: } static int -snapshot_request(struct vmctx *ctx, const char *file, bool suspend) +snapshot_request(const char *vmname, const char *file, bool suspend) { nvlist_t *nvl; @@ -1734,7 +1727,7 @@ snapshot_request(struct vmctx *ctx, const char *file, bool suspend) nvlist_add_string(nvl, "filename", file); nvlist_add_bool(nvl, "suspend", suspend); - return (send_message(ctx, nvl)); + return (send_message(vmname, nvl)); } #endif @@ -2398,10 +2391,10 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (!error && vm_checkpoint_opt) - error = snapshot_request(ctx, checkpoint_file, false); + error = snapshot_request(vmname, checkpoint_file, false); if (!error && vm_suspend_opt) - error = snapshot_request(ctx, suspend_file, true); + error = snapshot_request(vmname, suspend_file, true); #endif free (opts);