From nobody Sun Sep 21 14:53:01 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 4cV8PB2g4Nz68DMF; Sun, 21 Sep 2025 14:53:02 +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 4cV8PB16r3z3vgN; Sun, 21 Sep 2025 14:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466382; 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=bppO2HTFhb38ejHZgAqjY0QhMfD16wOclhywprfysC0=; b=Y1ZDlaT2HLmFe//FPa7MqOt7XKuoNOoE0j6HvUsVWaFOabokNSQslWnbtr+IisIX1DEfGJ su2uviyLeNS9pAxTgr/S7fIEsI+AwRDJoiwVRCGsq3DGUmiLuxhexPN4tcTYnvpexx1hyr FfaHPqMori3QcD9c3WsGFvecVJNnjOwP7oYFUgXGnmlmPrOuDWbSAFBpRAKERTOgyxdC4Q sLmJvgt4mg1lKIFNoXDMl7J/Wj+Z0tCh9tmJx9WALtjfPL/k04JM1B06EDA5rX0kZ5pMzp 2YaW0b+hvQcMF4sMouEL4/naPFEuniR4kBEbBWzajqCZBvm2J6/ZEVPiwJX8ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466382; 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=bppO2HTFhb38ejHZgAqjY0QhMfD16wOclhywprfysC0=; b=hl/1vi6gqTUcmLpgK8SsVMKZj4lbSE9LZYml2k0OwpVYpakXZ18VD6MtYiXrLl1YGTfzXp xWEcA0UXC483vvKfsstF2ISLpqSydarM15jaMe1BfWqi+DNzlCyfJHML8syDTlhLGjndgy jEGc0o+NlPBLQ590mHcFORaPSPMunj+drk6Xgy21Oelno7p2SJIB95QMzQGoLhUr6P9f2D qk4H1qHmNWbv1dvfcJkjMnpIvF+/k2Cgj+G4nQ+318lPOvkMgUmLuZB5IOxGj+OiQ/anoM isQbwB58u6fPQEFjgn/NjmtI2D5rOlgH9QjyH9GLgJtYCiOzInL2/18gVOmNSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758466382; a=rsa-sha256; cv=none; b=Y2FJG+uxOgqBqy2gE1XAY4+94ekwEdb1tFh+h7LNmuyK/8tPx0lpNW58d7j5y69bqtAzte dlxG2cOTb5SoOCd4wPQmOZwZ6qEOXRHc1YCdQFMpgDWM9uKoy3XJaOuI3xWKRO89tGp47B aTkwezDGtmb0XTQiYmDQPp5I5fyMvkaxNL6ohunm+bKw50pGuBh1gtHBOxLdrsGBQv0W5L d4dQEQmeA9wvU8aSjWpyqjDHfUO9JX5dr5xL80hlgsJc369rT85C2sVnumHeW3gmscHrXP heHnJwr8W5tgawVWKEFPXFvle+NFYykVPd9IpAER1iiXJJKruG0QGDfMz9jGQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cV8PB0WGHz3wY; Sun, 21 Sep 2025 14:53:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58LEr147017601; Sun, 21 Sep 2025 14:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LEr1GD017598; Sun, 21 Sep 2025 14:53:01 GMT (envelope-from git) Date: Sun, 21 Sep 2025 14:53:01 GMT Message-Id: <202509211453.58LEr1GD017598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7e8473273f02 - stable/14 - bhyve: insert VM name to the VNC screen title 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7e8473273f0254f381871f56cb1792dac5b6269e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8473273f0254f381871f56cb1792dac5b6269e commit 7e8473273f0254f381871f56cb1792dac5b6269e Author: Yuichiro NAITO AuthorDate: 2025-09-03 15:43:33 +0000 Commit: Mark Johnston CommitDate: 2025-09-21 14:52:38 +0000 bhyve: insert VM name to the VNC screen title Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52329 (cherry picked from commit 0e7f8abb45263c780a4b448fb52af6b6a3cbc9fd) --- usr.sbin/bhyve/rfb.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index 4e9f52ed4700..0b4888483559 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -64,6 +64,7 @@ #include "bhyvegc.h" #include "debug.h" #include "console.h" +#include "config.h" #include "rfb.h" #include "sockstream.h" @@ -153,6 +154,8 @@ struct rfb_softc { struct pixfmt pixfmt; /* owned by the write thread */ struct pixfmt new_pixfmt; /* managed with pixfmt_mtx */ uint32_t *pixrow; + char *fbname; + int fbnamelen; }; struct rfb_pixfmt { @@ -263,7 +266,7 @@ struct rfb_cuttext_msg { }; static void -rfb_send_server_init_msg(int cfd) +rfb_send_server_init_msg(struct rfb_softc *rc, int cfd) { struct bhyvegc_image *gc_image; struct rfb_srvr_info sinfo; @@ -285,9 +288,9 @@ rfb_send_server_init_msg(int cfd) sinfo.pixfmt.pad[0] = 0; sinfo.pixfmt.pad[1] = 0; sinfo.pixfmt.pad[2] = 0; - sinfo.namelen = htonl(strlen("bhyve")); + sinfo.namelen = htonl(rc->fbnamelen); (void)stream_write(cfd, &sinfo, sizeof(sinfo)); - (void)stream_write(cfd, "bhyve", strlen("bhyve")); + (void)stream_write(cfd, rc->fbname, rc->fbnamelen); } static void @@ -1145,7 +1148,7 @@ report_and_done: len = stream_read(cfd, buf, 1); /* 4a. Write server-init info */ - rfb_send_server_init_msg(cfd); + rfb_send_server_init_msg(rc, cfd); if (!rc->zbuf) { rc->zbuf = malloc(RFB_ZLIB_BUFSZ + 16); @@ -1277,6 +1280,13 @@ rfb_init(const char *hostname, int port, int wait, const char *password) rc->password = password; + rc->fbnamelen = asprintf(&rc->fbname, "bhyve:%s", + get_config_value("name")); + if (rc->fbnamelen < 0) { + EPRINTLN("rfb: failed to allocate memory for VNC title"); + goto error; + } + rc->pixrow = malloc(RFB_MAX_WIDTH * sizeof(uint32_t)); if (rc->pixrow == NULL) { EPRINTLN("rfb: failed to allocate memory for pixrow buffer"); @@ -1359,6 +1369,7 @@ rfb_init(const char *hostname, int port, int wait, const char *password) free(rc->crc); free(rc->crc_tmp); free(rc->pixrow); + free(rc->fbname); free(rc); return (-1); }