From nobody Sun May  5 21:15:02 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1600777780; cv=none;
	d=zohomail.com; s=zohoarc;
	b=IxShut5ZVJtf8WTmmgKitL6X5ojQb4HpeSgLpz+5PRnt3+/zGa6it0889dmkGOp8eOFbV5fOObA7Ljf0KtcKmfkYIBCfG0r6dSK09/2g7lqH+toExGX2pFqZPtuQyYHRxARXYJHUypNqTDMVm2rKdSmI8z7CdQqa3G+V8OC2NSU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1600777780;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=SpNi/HBSQlqPxt5XAuQmjG6PCIhatr2sjatfzAiJy4Y=;
	b=dqy8jqKo72BNhHtcCRDmAT4iWbXP4Idt9MwuCg3lrvXJ5u3/LaLW0HwKLXPLpDngoqVxS6u2Jl9uBkeetE8P5c9y/fhuf8W2VhHilTEJJo/mRWTpV/LLb55U68Lbkxf5hUygNEx0F85dEIIijN3a15kucjo6bfkye9TUsxd5+vA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bogorodskiy@gmail.com> (p=none dis=none)
 header.from=<bogorodskiy@gmail.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 160077778089248.160163093416145;
 Tue, 22 Sep 2020 05:29:40 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-231-ld73FUUuNfaFDCyDPFI3bw-1; Tue, 22 Sep 2020 08:29:20 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49DF2800470;
	Tue, 22 Sep 2020 12:29:14 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D3B578805;
	Tue, 22 Sep 2020 12:29:13 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 37FE118A0C0B;
	Tue, 22 Sep 2020 12:29:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 08MCT9Jj017256 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 22 Sep 2020 08:29:09 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id EE3702028E91; Tue, 22 Sep 2020 12:29:08 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E8AD9201EA97
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:06 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D711B101A56A
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:06 +0000 (UTC)
Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com
	[209.85.167.48]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-346-3G_u60uJM--1xJQ9Sa_o_A-1; Tue, 22 Sep 2020 08:29:04 -0400
Received: by mail-lf1-f48.google.com with SMTP id w11so17832669lfn.2
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 05:29:04 -0700 (PDT)
Received: from kloomba.my.domain ([5.227.242.255])
	by smtp.gmail.com with ESMTPSA id
	y26sm3715539ljy.88.2020.09.22.05.29.01
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Tue, 22 Sep 2020 05:29:01 -0700 (PDT)
X-MC-Unique: ld73FUUuNfaFDCyDPFI3bw-1
X-MC-Unique: 3G_u60uJM--1xJQ9Sa_o_A-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=SpNi/HBSQlqPxt5XAuQmjG6PCIhatr2sjatfzAiJy4Y=;
	b=qHfb/3TCmoTVL1MeJzwIJqP2DM81D6nv16RnCEkNHssiAPtDdZTPHWLslK0RQ3xoPk
	bjvt6rs7SAzHYf0h7irxoLd1ObnJ/QvKkfow05J2k9DvqGkod2ZSFM1OCelY1y0UxNUr
	3ieAtCVlgUbJperKZcXny6XpNQvDcu7yZVGxBAoBEsCj8KHECfkCtdHHD5+CY3MM2aHh
	yAnDOUK6iMlvXc6OyhwHPetnACkbuEcYnP85XjdQ8FbyyqDnbE2sEIQK1Kpeia5+/e1l
	4IbDK+CXNMxrpA7ztR3I9cq2kpGZRDiZTwxPN21fmqceCQwASXRZb63gIH6eo0i6sdd8
	1RWQ==
X-Gm-Message-State: AOAM53369qNHFzsmnX4Oum4Ky0m28W+9exihBJkk0xONrDcVWrpLoo3R
	MyMYnsziF/sixgSTxQiDWEGQpaTCdZskgeok
X-Google-Smtp-Source: 
 ABdhPJwsbj/AsZ6NC8KIS41f1R0lfMcKZmoVrR0078ufPNrHclEXp+uFUFNU1Oi3/1rM3N+jOwle9A==
X-Received: by 2002:a19:d11:: with SMTP id 17mr1511654lfn.0.1600777742415;
	Tue, 22 Sep 2020 05:29:02 -0700 (PDT)
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: libvir-list@redhat.com
Subject: [PATCH v2 1/4] bhyve: support parsing fbuf PCI device
Date: Tue, 22 Sep 2020 16:28:48 +0400
Message-Id: <20200922122851.70947-2-bogorodskiy@gmail.com>
In-Reply-To: <20200922122851.70947-1-bogorodskiy@gmail.com>
References: <20200922122851.70947-1-bogorodskiy@gmail.com>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false;
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-loop: libvir-list@redhat.com
Cc: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>,
	Roman Bogorodskiy <bogorodskiy@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

From: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>

Add a new helper function, bhyveParsePCIFbuf, to parse the bhyve-argv
parameters for a frame-buffer device to <graphics/> and <video/>
definitions.

For now, only the listen address, port, and vga mode are detected.
Unsupported parameters are silently skipped.

This involves upgrading the private API to expose the
virDomainGraphicsDefNew helper function, which is used by
bhyveParsePCIFbuf.

Signed-off-by: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/bhyve/bhyve_parse_command.c               | 91 ++++++++++++++++++-
 src/libvirt_private.syms                      |  1 +
 .../bhyveargv2xml-vnc-listen.args             | 10 ++
 .../bhyveargv2xml-vnc-listen.xml              | 22 +++++
 .../bhyveargv2xml-vnc-vga-io.args             | 10 ++
 .../bhyveargv2xml-vnc-vga-io.xml              | 22 +++++
 .../bhyveargv2xml-vnc-vga-off.args            | 10 ++
 .../bhyveargv2xml-vnc-vga-off.xml             | 23 +++++
 .../bhyveargv2xml-vnc-vga-on.args             | 10 ++
 .../bhyveargv2xml-vnc-vga-on.xml              | 23 +++++
 .../bhyveargv2xmldata/bhyveargv2xml-vnc.args  | 10 ++
 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml | 22 +++++
 tests/bhyveargv2xmltest.c                     |  5 +
 13 files changed, 258 insertions(+), 1 deletion(-)
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml

diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman=
d.c
index 50a5e88408..388c565317 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006-2016 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
  * Copyright (c) 2011 NetApp, Inc.
- * Copyright (C) 2016 Fabian Freyer
+ * Copyright (C) 2020 Fabian Freyer
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -553,6 +553,93 @@ bhyveParsePCINet(virDomainDefPtr def,
     return -1;
 }
=20
+static int
+bhyveParsePCIFbuf(virDomainDefPtr def,
+                  virDomainXMLOptionPtr xmlopt,
+                  unsigned caps G_GNUC_UNUSED,
+                  unsigned bus,
+                  unsigned slot,
+                  unsigned function,
+                  const char *config)
+{
+    /* -s slot,fbuf,wait,vga=3Don|io|off,rfb=3D<ip>:port,w=3Dwidth,h=3Dhei=
ght */
+
+    virDomainVideoDefPtr video =3D NULL;
+    virDomainGraphicsDefPtr graphics =3D NULL;
+    char **params =3D NULL;
+    char *param =3D NULL, *separator =3D NULL;
+    size_t nparams =3D 0;
+    unsigned int i =3D 0;
+
+    if (!(video =3D virDomainVideoDefNew(xmlopt)))
+        goto cleanup;
+
+    if (!(graphics =3D virDomainGraphicsDefNew(xmlopt)))
+        goto cleanup;
+
+    graphics->type =3D VIR_DOMAIN_GRAPHICS_TYPE_VNC;
+    video->info.addr.pci.bus =3D bus;
+    video->info.addr.pci.slot =3D slot;
+    video->info.addr.pci.function =3D function;
+
+    if (!config)
+        goto error;
+
+    if (!(params =3D virStringSplitCount(config, ",", 0, &nparams)))
+        goto error;
+
+    for (i =3D 0; i < nparams; i++) {
+        param =3D params[i];
+        if (!video->driver && VIR_ALLOC(video->driver) < 0)
+            goto error;
+
+        if (STREQ(param, "vga=3Don"))
+            video->driver->vgaconf =3D VIR_DOMAIN_VIDEO_VGACONF_ON;
+
+        if (STREQ(param, "vga=3Dio"))
+            video->driver->vgaconf =3D VIR_DOMAIN_VIDEO_VGACONF_IO;
+
+        if (STREQ(param, "vga=3Doff"))
+            video->driver->vgaconf =3D VIR_DOMAIN_VIDEO_VGACONF_OFF;
+
+        if (STRPREFIX(param, "rfb=3D") || STRPREFIX(param, "tcp=3D")) {
+            /* fortunately, this is the same length as "tcp=3D" */
+            param +=3D strlen("rfb=3D");
+
+            if (!(separator =3D strchr(param, ':')))
+                goto error;
+
+            *separator =3D '\0';
+
+            if (separator !=3D param)
+                virDomainGraphicsListenAppendAddress(graphics, param);
+            else
+                /* Default to 127.0.0.1, just like bhyve does */
+                virDomainGraphicsListenAppendAddress(graphics, "127.0.0.1"=
);
+
+            param =3D ++separator;
+            if (virStrToLong_i(param, NULL, 10, &graphics->data.vnc.port))
+                goto error;
+        }
+    }
+
+ cleanup:
+    if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
+        goto error;
+
+    if (VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics) < 0)
+        goto error;
+
+    g_strfreev(params);
+    return 0;
+
+ error:
+    virDomainVideoDefFree(video);
+    virDomainGraphicsDefFree(graphics);
+    g_strfreev(params);
+    return -1;
+}
+
 static int
 bhyveParseBhyvePCIArg(virDomainDefPtr def,
                       virDomainXMLOptionPtr xmlopt,
@@ -615,6 +702,8 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def,
     else if (STREQ(emulation, "e1000"))
         bhyveParsePCINet(def, xmlopt, caps, bus, slot, function,
                          VIR_DOMAIN_NET_MODEL_E1000, conf);
+    else if (STREQ(emulation, "fbuf"))
+        bhyveParsePCIFbuf(def, xmlopt, caps, bus, slot, function, conf);
=20
     VIR_FREE(emulation);
     VIR_FREE(slotdef);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bdbe3431b8..96bc7cccb7 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -418,6 +418,7 @@ virDomainGraphicsAuthConnectedTypeFromString;
 virDomainGraphicsAuthConnectedTypeToString;
 virDomainGraphicsDefFree;
 virDomainGraphicsDefHasOpenGL;
+virDomainGraphicsDefNew;
 virDomainGraphicsGetListen;
 virDomainGraphicsGetRenderNode;
 virDomainGraphicsListenAppendAddress;
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args b/tests/=
bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args
new file mode 100644
index 0000000000..b97b64a0dc
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D1.2.3.4:5900 \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml b/tests/b=
hyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
new file mode 100644
index 0000000000..4ab17aef81
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
@@ -0,0 +1,22 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5900' autoport=3D'no' listen=3D'1.2.3.4=
'>
+      <listen type=3D'address' address=3D'1.2.3.4'/>
+    </graphics>
+    <video>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args b/tests/=
bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args
new file mode 100644
index 0000000000..f4c0067b79
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D:5900,vga=3Dio \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml b/tests/b=
hyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
new file mode 100644
index 0000000000..1e2f3d6938
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
@@ -0,0 +1,22 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5900' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args b/tests=
/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args
new file mode 100644
index 0000000000..4bd5ed1027
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D:5900,vga=3Doff \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml b/tests/=
bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
new file mode 100644
index 0000000000..3c9c76e5aa
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
@@ -0,0 +1,23 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5900' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <driver vgaconf=3D'off'/>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args b/tests/=
bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args
new file mode 100644
index 0000000000..d17f347a39
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D:5900,vga=3Don \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml b/tests/b=
hyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
new file mode 100644
index 0000000000..b83772c47a
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
@@ -0,0 +1,23 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5900' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <driver vgaconf=3D'on'/>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.args b/tests/bhyvear=
gv2xmldata/bhyveargv2xml-vnc.args
new file mode 100644
index 0000000000..fd4178f0a8
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D:5900 \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml b/tests/bhyvearg=
v2xmldata/bhyveargv2xml-vnc.xml
new file mode 100644
index 0000000000..1e2f3d6938
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml
@@ -0,0 +1,22 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5900' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c
index 2a497f48e8..0c0383f593 100644
--- a/tests/bhyveargv2xmltest.c
+++ b/tests/bhyveargv2xmltest.c
@@ -181,6 +181,11 @@ mymain(void)
     DO_TEST_FAIL("bhyveload-memsize-fail");
     DO_TEST("bhyveload-bootorder");
     DO_TEST_FAIL("extraargs");
+    DO_TEST("vnc");
+    DO_TEST("vnc-listen");
+    DO_TEST("vnc-vga-on");
+    DO_TEST("vnc-vga-off");
+    DO_TEST("vnc-vga-io");
=20
     virObjectUnref(driver.caps);
     virObjectUnref(driver.xmlopt);
--=20
2.27.0

From nobody Sun May  5 21:15:02 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1600777776; cv=none;
	d=zohomail.com; s=zohoarc;
	b=H/0vc5OmmBsNtlEKzRn41n/NvFWRmrKjiPdTMo32M7q+35nM0W00HJIinlslmJpweUkKT/KGwZ61pYUYWhD2gJRmgOL2Ma9KixnJoSbOFgXr7IxkIHJpIcsPMIpRGV93+7/OfWRmWKTsc1qq3ahx7qFicoTxxR8XpziCxGCUOjk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1600777776;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=5mm8dJMrQHLexaJPwMCZHNYcPzdmH++9UAIvj20ctjI=;
	b=Bo1EiNgil4Gxqwd/Xg/Hkar0QI/KQgPgQy2SeXpRh5U9DA7D/7njFH2KgR0SGRRMH4VGn/lX3JmkjTSq+ki9D6NF/JmqiWXrA80UiOmWRnECN0MmK9ZotmiOZbYF9i8BLjEEbm2PLRmg/Cdb6HvgbjrUIn8dpZBqsXNW2d8i8Xw=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bogorodskiy@gmail.com> (p=none dis=none)
 header.from=<bogorodskiy@gmail.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 1600777776593820.3869248416853;
 Tue, 22 Sep 2020 05:29:36 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-398-yW7AtRFrP3imTFHn4Ysrpg-1; Tue, 22 Sep 2020 08:29:32 -0400
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC340807341;
	Tue, 22 Sep 2020 12:29:24 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EF0D7367E;
	Tue, 22 Sep 2020 12:29:24 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 67E74922EB;
	Tue, 22 Sep 2020 12:29:24 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 08MCTAjg017266 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 22 Sep 2020 08:29:10 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B5C452166B28; Tue, 22 Sep 2020 12:29:10 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id AFE632156A34
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:08 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CF3118AE957
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:08 +0000 (UTC)
Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com
	[209.85.167.46]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-524-z-UQSFr3NeScEQOcog7VqQ-1; Tue, 22 Sep 2020 08:29:06 -0400
Received: by mail-lf1-f46.google.com with SMTP id z19so17836258lfr.4
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 05:29:05 -0700 (PDT)
Received: from kloomba.my.domain ([5.227.242.255])
	by smtp.gmail.com with ESMTPSA id
	y26sm3715539ljy.88.2020.09.22.05.29.02
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Tue, 22 Sep 2020 05:29:03 -0700 (PDT)
X-MC-Unique: yW7AtRFrP3imTFHn4Ysrpg-1
X-MC-Unique: z-UQSFr3NeScEQOcog7VqQ-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=5mm8dJMrQHLexaJPwMCZHNYcPzdmH++9UAIvj20ctjI=;
	b=RR7pH47iDQs+0VjAnYjtnjiA07bVKVYhKsp4J/431TZffQmGQIOUY97h8KGT1jChj/
	pMEdE2bLXhoiWR7GXOKRdkFprLCTOwhCWi1chCzR9ymOhsvS2JF1mMlkk5DQy/LIjb5B
	sqMHlpvHB7AKVBsWQIU9SIeyNSuWKdL0nAyufiENUYOnOeUSHowLIqdWzTXB3PUL+klm
	RauDCoxNwxSnuKct160MDRWSN7+T8iHjCxEztmhHdFDDNtB/eqxbkmnf7IqQth/yBFIg
	En8oLF1YqNXMR1C9XPRElA6OLDrdofmNigtUApgj9+WO0Yh+SAbzt9KPTVoWdflpwilw
	kMjQ==
X-Gm-Message-State: AOAM5329tKCrKlZTn6njoJC2Yl27HKP/gWP/rC+7CHQXg28NaYh6DTpT
	fdsSZdrdjA54Kjf+waomi90zTXTyYYHazDs/
X-Google-Smtp-Source: 
 ABdhPJxhUOKZZs0LSfmQd+0C9pfhsq6EK1IBSCxjbQkrkhZjboPOfd6Fcpq4AXK+ECciIoue2xN95A==
X-Received: by 2002:a19:3f91:: with SMTP id
 m139mr1476711lfa.416.1600777743847;
	Tue, 22 Sep 2020 05:29:03 -0700 (PDT)
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: libvir-list@redhat.com
Subject: [PATCH v2 2/4] bhyve: add support for setting fbuf resolution
Date: Tue, 22 Sep 2020 16:28:49 +0400
Message-Id: <20200922122851.70947-3-bogorodskiy@gmail.com>
In-Reply-To: <20200922122851.70947-1-bogorodskiy@gmail.com>
References: <20200922122851.70947-1-bogorodskiy@gmail.com>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false;
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>,
	Roman Bogorodskiy <bogorodskiy@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

From: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>

The resolution of the VNC framebuffer can now be set via the resolution
definition introduced in 5.9.0.

Also, add "gop" to the list of model types  the <resolution/>
sub-element is valid for.

Signed-off-by: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 NEWS.rst                                      |  5 +++
 docs/formatdomain.rst                         |  3 +-
 src/bhyve/bhyve_command.c                     |  3 ++
 src/bhyve/bhyve_parse_command.c               | 20 ++++++++++++
 .../bhyveargv2xml-vnc-resolution.args         | 10 ++++++
 .../bhyveargv2xml-vnc-resolution.xml          | 24 ++++++++++++++
 tests/bhyveargv2xmltest.c                     |  1 +
 .../bhyvexml2argv-vnc-resolution.args         | 10 ++++++
 .../bhyvexml2argv-vnc-resolution.ldargs       |  1 +
 .../bhyvexml2argv-vnc-resolution.xml          | 20 ++++++++++++
 tests/bhyvexml2argvtest.c                     |  1 +
 .../bhyvexml2xmlout-vnc-resolution.xml        | 31 +++++++++++++++++++
 tests/bhyvexml2xmltest.c                      |  1 +
 13 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.ar=
gs
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ar=
gs
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ld=
args
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml
 create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolutio=
n.xml

diff --git a/NEWS.rst b/NEWS.rst
index 685c5e2225..bb48f5bd43 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -20,6 +20,11 @@ v6.8.0 (unreleased)
     attribute of the device's ``<source>`` element can be used to disable =
the
     filtering and allow all guest writes to the configuration space.
=20
+  * bhyve: Support setting the framebuffer resolution
+
+    Libvirt can now set the framebuffer's "w" and "h" parameters
+    using the ``resolution`` element.
+
 * **Improvements**
=20
   * qemu: Allow migration over UNIX sockets
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index d5930a4ac1..888db5ea29 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -5822,7 +5822,8 @@ A video device.
    :since:`Since 5.9.0` , the ``model`` element may also have an optional
    ``resolution`` sub-element. The ``resolution`` element has attributes `=
`x``
    and ``y`` to set the minimum resolution for the video device. This
-   sub-element is valid for model types "vga", "qxl", "bochs", and "virtio=
".
+   sub-element is valid for model types "vga", "qxl", "bochs", "gop",
+   and "virtio".
=20
 ``acceleration``
    Configure if video acceleration should be enabled.
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 4df5baabdf..176a339d5a 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -468,6 +468,9 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def,
         return -1;
     }
=20
+    if (video->res)
+        virBufferAsprintf(&opt, ",w=3D%d,h=3D%d", video->res->x, video->re=
s->y);
+
     if (video->driver)
         virBufferAsprintf(&opt, ",vga=3D%s",
                           virDomainVideoVGAConfTypeToString(video->driver-=
>vgaconf));
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman=
d.c
index 388c565317..c6abdfacf3 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -621,6 +621,26 @@ bhyveParsePCIFbuf(virDomainDefPtr def,
             if (virStrToLong_i(param, NULL, 10, &graphics->data.vnc.port))
                 goto error;
         }
+
+        if (STRPREFIX(param, "w=3D")) {
+            param +=3D strlen("w=3D");
+
+            if (video->res =3D=3D NULL)
+                video->res =3D g_new0(virDomainVideoResolutionDef, 1);
+
+            if (virStrToLong_uip(param, NULL, 10, &video->res->x))
+                goto error;
+        }
+
+        if (STRPREFIX(param, "h=3D")) {
+            param +=3D strlen("h=3D");
+
+            if (video->res =3D=3D NULL)
+                video->res =3D g_new0(virDomainVideoResolutionDef, 1);
+
+            if (virStrToLong_uip(param, NULL, 10, &video->res->y))
+                goto error;
+        }
     }
=20
  cleanup:
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.args b/te=
sts/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.args
new file mode 100644
index 0000000000..e5e2c0f2e8
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 2:0,fbuf,tcp=3D127.0.0.1:5904,w=3D1920,h=3D1080 \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml b/tes=
ts/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
new file mode 100644
index 0000000000..f8fa0ed1ce
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
@@ -0,0 +1,24 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5904' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'default' heads=3D'1'>
+        <resolution x=3D'1920' y=3D'1080'/>
+      </model>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c
index 0c0383f593..4bf39d50dc 100644
--- a/tests/bhyveargv2xmltest.c
+++ b/tests/bhyveargv2xmltest.c
@@ -186,6 +186,7 @@ mymain(void)
     DO_TEST("vnc-vga-on");
     DO_TEST("vnc-vga-off");
     DO_TEST("vnc-vga-io");
+    DO_TEST("vnc-resolution");
=20
     virObjectUnref(driver.caps);
     virObjectUnref(driver.xmlopt);
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args b/te=
sts/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
new file mode 100644
index 0000000000..5e54da6ed7
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 1:0,lpc \
+-s 2:0,fbuf,tcp=3D127.0.0.1:5904,w=3D1920,h=3D1080 bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs b/=
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs
new file mode 100644
index 0000000000..421376db9e
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs
@@ -0,0 +1 @@
+dummy
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml b/tes=
ts/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml
new file mode 100644
index 0000000000..637a121fb7
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml
@@ -0,0 +1,20 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory>219136</memory>
+  <vcpu>1</vcpu>
+  <os>
+    <type>hvm</type>
+    <loader readonly=3D"yes" type=3D"pflash">/path/to/test.fd</loader>
+  </os>
+  <devices>
+    <video>
+      <model type=3D'gop' heads=3D'1' primary=3D'yes'>
+        <resolution x=3D"1920" y=3D"1080"/>
+      </model>
+    </video>
+    <graphics type=3D'vnc' port=3D'5904'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index 2167cd6310..d4c4275702 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -197,6 +197,7 @@ mymain(void)
     DO_TEST("vnc-vgaconf-off");
     DO_TEST("vnc-vgaconf-io");
     DO_TEST("vnc-autoport");
+    DO_TEST("vnc-resolution");
     DO_TEST("cputopology");
     DO_TEST_FAILURE("cputopology-nvcpu-mismatch");
     DO_TEST("commandline");
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml b=
/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml
new file mode 100644
index 0000000000..79843531da
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml
@@ -0,0 +1,31 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64'>hvm</type>
+    <loader readonly=3D'yes' type=3D'pflash'>/path/to/test.fd</loader>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'isa' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <graphics type=3D'vnc' port=3D'5904' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'gop' heads=3D'1' primary=3D'yes'>
+        <resolution x=3D'1920' y=3D'1080'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c
index 3bf2187250..b266e8b934 100644
--- a/tests/bhyvexml2xmltest.c
+++ b/tests/bhyvexml2xmltest.c
@@ -106,6 +106,7 @@ mymain(void)
     DO_TEST_DIFFERENT("vnc-vgaconf-off");
     DO_TEST_DIFFERENT("vnc-vgaconf-io");
     DO_TEST_DIFFERENT("vnc-autoport");
+    DO_TEST_DIFFERENT("vnc-resolution");
     DO_TEST_DIFFERENT("commandline");
     DO_TEST_DIFFERENT("msrs");
     DO_TEST_DIFFERENT("sound");
--=20
2.27.0

From nobody Sun May  5 21:15:02 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1600777768; cv=none;
	d=zohomail.com; s=zohoarc;
	b=XzAOLN7dH3468Et2Nr1MF1Cco1EWhwdJ0EolqDuFIbo+29UMylQfXVKp52C9q1NGqks7jUWgt5ZeWeAJpYF0ebdNm7c1Ez8ULM6puXJtf7Vi0rhFeYahgxNInaz+P4H2p38DFl4kC1pdqE8Bh4ekpzDZyv3fDtQeRgkZvDUTkkk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1600777768;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=DwyBQwn8o4+6jUXmKbN+/LFi2xcQyVDJC/IGLVqqMC4=;
	b=aivJBn8Cc0tH/GqjxoLl2ldLUy+KtDocTlufZ5FPcZ4jeuLgc2jLaL4U8bf337nPUjY4WtM5a1RJp/EyHjtsPI2S61CXTHcKZqKNelGJ9AIXLLkaPLK8i8OhuX7YXcNYu+5vfPevHKOpFxChKC6b+mS2NZ65ewuRdBf19cpF8Hc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bogorodskiy@gmail.com> (p=none dis=none)
 header.from=<bogorodskiy@gmail.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 1600777768585326.4748668076037;
 Tue, 22 Sep 2020 05:29:28 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-565-oyG0YLtYPaKDMDqtNfpk2A-1; Tue, 22 Sep 2020 08:29:23 -0400
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0A348018A4;
	Tue, 22 Sep 2020 12:29:17 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C99FD73695;
	Tue, 22 Sep 2020 12:29:17 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8CB76922EA;
	Tue, 22 Sep 2020 12:29:17 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 08MCTDK6017287 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 22 Sep 2020 08:29:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D7B5B201C0DC; Tue, 22 Sep 2020 12:29:13 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id D2125201EB53
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:10 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EFB7C858286
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:09 +0000 (UTC)
Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com
	[209.85.208.193]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-461-13jrl0gPO3CfZb7ddYrifw-1; Tue, 22 Sep 2020 08:29:07 -0400
Received: by mail-lj1-f193.google.com with SMTP id y4so13958135ljk.8
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 05:29:06 -0700 (PDT)
Received: from kloomba.my.domain ([5.227.242.255])
	by smtp.gmail.com with ESMTPSA id
	y26sm3715539ljy.88.2020.09.22.05.29.03
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Tue, 22 Sep 2020 05:29:04 -0700 (PDT)
X-MC-Unique: oyG0YLtYPaKDMDqtNfpk2A-1
X-MC-Unique: 13jrl0gPO3CfZb7ddYrifw-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=DwyBQwn8o4+6jUXmKbN+/LFi2xcQyVDJC/IGLVqqMC4=;
	b=BkNk/uhBAEr1vIJZznTOU//APCZOZTfRxbJ7+v9OWRy4GGC0QFR2FOCh+t/IJAS7R6
	AtCF4+FT0Ff5EEHrXtwVTwjgG8vtVwkBNtbDQuhEISlOHPbJb1VqV3vVzWjC8/kJ06Um
	2iat0dSyyGmFAxIyEB343K9tSoMCC9m90jA3g9IKzNhkL/wotNY+PFNohvGe8AISyrZW
	740JFvuPG5wxVfui7YXnW2aIou908gRIUZw9Fn/gzZTsjyHxVKcG0gTVvp9Gim6o5VFS
	lfrmBNako1qXqPYzVq3h9FrhO5xL/HORtsQtaCS/2K0AMI7uDnhuQ81leI2rRCKTGOZa
	PHLA==
X-Gm-Message-State: AOAM533LXrYkR186Ew1ronSMOOd0XS3cxEGVCkCcSy8cX3vAIpSW3m9l
	QG7LuRHzfch85bo5gDTKtZKhW0EgJxFHmvIz
X-Google-Smtp-Source: 
 ABdhPJwb7RPw6hJcPQh3uxAwsz2P/j0zNKM+rlMXmzVyvERPELtM2gMQ1YKlbgBZ08Is/H7pjoe0lw==
X-Received: by 2002:a2e:86c7:: with SMTP id n7mr1514601ljj.229.1600777745359;
	Tue, 22 Sep 2020 05:29:05 -0700 (PDT)
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: libvir-list@redhat.com
Subject: [PATCH v2 3/4] bhyve: probe for VNC password capability
Date: Tue, 22 Sep 2020 16:28:50 +0400
Message-Id: <20200922122851.70947-4-bogorodskiy@gmail.com>
In-Reply-To: <20200922122851.70947-1-bogorodskiy@gmail.com>
References: <20200922122851.70947-1-bogorodskiy@gmail.com>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false;
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-loop: libvir-list@redhat.com
Cc: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>,
	Roman Bogorodskiy <bogorodskiy@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

From: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>

Introduces the BHYVE_CAP_VNC_PASSWORD capability, which is probed by
parsing the error message from the bhyve command. When it is not
supported, bhyve -s 0,fbuf,password=3D will return an error message.

Signed-off-by: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/bhyve/bhyve_capabilities.c | 16 +++++++++++++++-
 src/bhyve/bhyve_capabilities.h |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index 36f3985335..523a31e287 100644
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 Roman Bogorodskiy
  * Copyright (C) 2014 Semihalf
- * Copyright (C) 2016 Fabian Freyer
+ * Copyright (C) 2020 Fabian Freyer
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -334,6 +334,17 @@ bhyveProbeCapsSoundHda(unsigned int *caps, char *binar=
y)
 }
=20
=20
+static int
+bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary)
+{
+    return bhyveProbeCapsDeviceHelper(caps, binary,
+                                      "-s",
+                                      "0,fbuf,password=3D",
+                                      "Invalid fbuf emulation \"password\"=
",
+                                      BHYVE_CAP_VNC_PASSWORD);
+}
+
+
 int
 virBhyveProbeCaps(unsigned int *caps)
 {
@@ -365,6 +376,9 @@ virBhyveProbeCaps(unsigned int *caps)
     if ((ret =3D bhyveProbeCapsSoundHda(caps, binary)))
         goto out;
=20
+    if ((ret =3D bhyveProbeCapsVNCPassword(caps, binary)))
+        goto out;
+
  out:
     VIR_FREE(binary);
     return ret;
diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h
index 1ac9ff4283..b2a16b0189 100644
--- a/src/bhyve/bhyve_capabilities.h
+++ b/src/bhyve/bhyve_capabilities.h
@@ -50,6 +50,7 @@ typedef enum {
     BHYVE_CAP_XHCI =3D 1 << 5,
     BHYVE_CAP_CPUTOPOLOGY =3D 1 << 6,
     BHYVE_CAP_SOUND_HDA =3D 1 << 7,
+    BHYVE_CAP_VNC_PASSWORD =3D 1 << 8,
 } virBhyveCapsFlags;
=20
 int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps);
--=20
2.27.0

From nobody Sun May  5 21:15:02 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 63.128.21.124 as permitted sender) client-ip=63.128.21.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1600777776; cv=none;
	d=zohomail.com; s=zohoarc;
	b=UviLxILpYWPqpf7CI47u96iCjJPTHVdD/YjySWIenvUggsFfewlhWFaj417DuAAvekNizgtdz6OW3IFp9UsnOE31eSfkNv9rt8xpzCzLrh8kzX4mU5yByAWqlEYtOcbSL7Lh8jxCIWU5B7pVWYPwc8/OEC/RkPpU+bbClxAtN/8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1600777776;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=zeUqfOQvzKbNobapFJLwB2MIRwlaAfb5YMn1pc/dxsA=;
	b=DzyPMNd8QXG1cmKTOvH+OSKT7JXqzFhNCZ5lr/XWx5uMLzbDDIFuwbUO/UjpLiTp+blXvMcDbyqFNn0K0U07ub0F+AtIxR5tAO21oJre6gF7J57woqBrYBYs/nHr829l/cjkDPW3yyhI85CYB+flZUGEuv2A/ajt6Pi2NjAr7kA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<bogorodskiy@gmail.com> (p=none dis=none)
 header.from=<bogorodskiy@gmail.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com
	with SMTPS id 1600777776809748.2817027133905;
 Tue, 22 Sep 2020 05:29:36 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-166-T7SLli7hP0qgnE5VtQY7ow-1; Tue, 22 Sep 2020 08:29:33 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D8B864086;
	Tue, 22 Sep 2020 12:29:28 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 058125577B;
	Tue, 22 Sep 2020 12:29:28 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C0DDE922EC;
	Tue, 22 Sep 2020 12:29:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 08MCTCHN017272 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 22 Sep 2020 08:29:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id E21122156A30; Tue, 22 Sep 2020 12:29:11 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id DD0282156A36
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:11 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[205.139.110.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF79A85829C
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 12:29:11 +0000 (UTC)
Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com
	[209.85.167.67]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-584-BvtADrqOMPG7Eq0hg0ii1A-1; Tue, 22 Sep 2020 08:29:09 -0400
Received: by mail-lf1-f67.google.com with SMTP id b22so17772795lfs.13
	for <libvir-list@redhat.com>; Tue, 22 Sep 2020 05:29:08 -0700 (PDT)
Received: from kloomba.my.domain ([5.227.242.255])
	by smtp.gmail.com with ESMTPSA id
	y26sm3715539ljy.88.2020.09.22.05.29.05
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Tue, 22 Sep 2020 05:29:06 -0700 (PDT)
X-MC-Unique: T7SLli7hP0qgnE5VtQY7ow-1
X-MC-Unique: BvtADrqOMPG7Eq0hg0ii1A-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:content-transfer-encoding;
	bh=zeUqfOQvzKbNobapFJLwB2MIRwlaAfb5YMn1pc/dxsA=;
	b=NHlKm3bagRfGnwLkLnyFxf4ZzJuSKAHUsMV5rxh1ijnYzhaj0MOK23YfZ4hyal2icQ
	VlRTgsNagTXd6XgienuxUMLT5t+nowgjPAhvafLC8vIBlK6W++yIk1cHk1iPTYGsMAef
	CnJnJcGAIzt8J0Uk2h7OTGl3rgLWBZgV2uY82c07EhPrjTm5toUEyl7MAFlhTCqXatMO
	q74vUD1MmemavtcEwnTSv07nX6foZjvk4/q4+QOEVw/+z6Ieg1gAUtaQ4f6MgZRS28KE
	S6vcSILed/GlmSXLw33RYBORA9q9hUi54hzq1LzbyQiR5A0dWKjrCy4muVQ/IoQzCNxy
	LW/w==
X-Gm-Message-State: AOAM530cdIYWYczTklMrcMeVwBpcu/hp0Ljgwy1oolbqyAU/I/XXuSqN
	Rao84hEebGotlzRuVXepnA2fCQluaX1D+S7C
X-Google-Smtp-Source: 
 ABdhPJysMXo+7Fcki4qCQ/v9CnV80YPMt2ewOxQh1jIhqrbABKDaekiytDR3/slmF2EDiA9ROMVArw==
X-Received: by 2002:a19:606:: with SMTP id 6mr1497792lfg.407.1600777746914;
	Tue, 22 Sep 2020 05:29:06 -0700 (PDT)
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
To: libvir-list@redhat.com
Subject: [PATCH v2 4/4] bhyve: add VNC password support
Date: Tue, 22 Sep 2020 16:28:51 +0400
Message-Id: <20200922122851.70947-5-bogorodskiy@gmail.com>
In-Reply-To: <20200922122851.70947-1-bogorodskiy@gmail.com>
References: <20200922122851.70947-1-bogorodskiy@gmail.com>
MIME-Version: 1.0
X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection
	Definition; Similar Internal Domain=false;
	Similar Monitored External Domain=false;
	Custom External Domain=false; Mimecast External Domain=false;
	Newly Observed Domain=false; Internal User Name=false;
	Custom Display Name List=false; Reply-to Address Mismatch=false;
	Targeted Threat Dictionary=false;
	Mimecast Threat Dictionary=false; Custom Threat Dictionary=false;
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>,
	Roman Bogorodskiy <bogorodskiy@gmail.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

From: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>

Support setting a password for the VNC framebuffer using the passwd
attribute on the <graphics/> element, if the driver has the
BHYVE_CAP_VNC_PASSWORD capability.

Note that virsh domxml-from-native does not output the password in the
generated XML, as VIR_DOMAIN_DEF_FORMAT_SECURE is not set when
formatting the domain definition.

Signed-off-by: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 NEWS.rst                                      |  7 +++
 src/bhyve/bhyve_command.c                     | 33 +++++++++-----
 src/bhyve/bhyve_parse_command.c               |  5 +++
 .../bhyveargv2xml-vnc-password.args           | 10 +++++
 .../bhyveargv2xml-vnc-password.xml            | 22 ++++++++++
 tests/bhyveargv2xmltest.c                     |  3 +-
 .../bhyvexml2argv-vnc-password-comma.xml      | 26 +++++++++++
 .../bhyvexml2argv-vnc-password.args           | 12 +++++
 .../bhyvexml2argv-vnc-password.ldargs         |  1 +
 .../bhyvexml2argv-vnc-password.xml            | 26 +++++++++++
 tests/bhyvexml2argvtest.c                     |  8 +++-
 .../bhyvexml2xmlout-vnc-password.xml          | 44 +++++++++++++++++++
 tests/bhyvexml2xmltest.c                      |  1 +
 13 files changed, 185 insertions(+), 13 deletions(-)
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args
 create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comm=
a.xml
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldar=
gs
 create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml
 create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.=
xml

diff --git a/NEWS.rst b/NEWS.rst
index bb48f5bd43..c949cb941b 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -25,6 +25,13 @@ v6.8.0 (unreleased)
     Libvirt can now set the framebuffer's "w" and "h" parameters
     using the ``resolution`` element.
=20
+  * bhyve: Support VNC password authentication
+
+    Libvirt can now probe whether the bhyve binary supports
+    VNC password authentication. In case it does, a VNC password
+    can now be passed using the ``passwd`` attribute on
+    the ``<graphics>`` element.
+
 * **Improvements**
=20
   * qemu: Allow migration over UNIX sockets
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 176a339d5a..1b48438168 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -424,17 +424,6 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def,
             return -1;
         }
=20
-        if (graphics->data.vnc.auth.passwd) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("vnc password auth not supported"));
-            return -1;
-        } else {
-             /* Bhyve doesn't support VNC Auth yet, so print a warning abo=
ut
-              * unauthenticated VNC sessions */
-             VIR_WARN("%s", _("Security warning: currently VNC auth is not"
-                              " supported."));
-        }
-
         if (glisten->address) {
             escapeAddr =3D strchr(glisten->address, ':') !=3D NULL;
             if (escapeAddr)
@@ -468,6 +457,28 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def,
         return -1;
     }
=20
+    if (graphics->data.vnc.auth.passwd) {
+        if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("VNC Passwort authentication not supported "
+                             "by bhyve"));
+            return -1;
+        }
+
+        if (strchr(graphics->data.vnc.auth.passwd, ',')) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("Password may not contain ',' character"));
+            return -1;
+        }
+
+        virBufferAsprintf(&opt, ",password=3D%s", graphics->data.vnc.auth.=
passwd);
+    } else {
+        if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_VNC_PASSWORD))
+            VIR_WARN("%s", _("Security warning: VNC auth is not supported.=
"));
+        else
+            VIR_WARN("%s", _("Security warning: VNC is used without authen=
tication."));
+    }
+
     if (video->res)
         virBufferAsprintf(&opt, ",w=3D%d,h=3D%d", video->res->x, video->re=
s->y);
=20
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman=
d.c
index c6abdfacf3..05cb8eb7d6 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -641,6 +641,11 @@ bhyveParsePCIFbuf(virDomainDefPtr def,
             if (virStrToLong_uip(param, NULL, 10, &video->res->y))
                 goto error;
         }
+
+        if (STRPREFIX(param, "password=3D")) {
+            param +=3D strlen("password=3D");
+            graphics->data.vnc.auth.passwd =3D g_strdup(param);
+        }
     }
=20
  cleanup:
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args b/test=
s/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args
new file mode 100644
index 0000000000..c16e970795
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args
@@ -0,0 +1,10 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 4:0,fbuf,tcp=3D127.0.0.1:5904,password=3Ds3cr3t \
+-s 1,lpc bhyve
diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml b/tests=
/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
new file mode 100644
index 0000000000..456a1ee9e3
--- /dev/null
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
@@ -0,0 +1,22 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type>hvm</type>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <graphics type=3D'vnc' port=3D'5904' autoport=3D'no' listen=3D'127.0.0=
.1' passwd=3D's3cr3t'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'default' heads=3D'1'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c
index 4bf39d50dc..2c1ffc75f3 100644
--- a/tests/bhyveargv2xmltest.c
+++ b/tests/bhyveargv2xmltest.c
@@ -76,7 +76,7 @@ testCompareXMLToArgvFiles(const char *xmlfile,
         return -1;
     }
=20
-    if (vmdef && !(actualxml =3D virDomainDefFormat(vmdef, driver.xmlopt, =
0)))
+    if (vmdef && !(actualxml =3D virDomainDefFormat(vmdef, driver.xmlopt, =
VIR_DOMAIN_DEF_FORMAT_SECURE)))
         return -1;
=20
     if (vmdef && virTestCompareToFile(actualxml, xmlfile) < 0)
@@ -187,6 +187,7 @@ mymain(void)
     DO_TEST("vnc-vga-off");
     DO_TEST("vnc-vga-io");
     DO_TEST("vnc-resolution");
+    DO_TEST("vnc-password");
=20
     virObjectUnref(driver.caps);
     virObjectUnref(driver.xmlopt);
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml b=
/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml
new file mode 100644
index 0000000000..76dd36f72a
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml
@@ -0,0 +1,26 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory>219136</memory>
+  <vcpu>1</vcpu>
+  <os>
+    <type>hvm</type>
+    <loader readonly=3D"yes" type=3D"pflash">/path/to/test.fd</loader>
+  </os>
+  <devices>
+    <disk type=3D'file'>
+      <driver name=3D'file' type=3D'raw'/>
+      <source file=3D'/tmp/freebsd.img'/>
+      <target dev=3D'hda' bus=3D'sata'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'2' unit=
=3D'0'/>
+    </disk>
+    <interface type=3D'bridge'>
+      <model type=3D'virtio'/>
+      <source bridge=3D"virbr0"/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <graphics type=3D'vnc' port=3D'5904' passwd=3D"in,valid">
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args b/test=
s/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
new file mode 100644
index 0000000000..b3b1c244be
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
@@ -0,0 +1,12 @@
+/usr/sbin/bhyve \
+-c 1 \
+-m 214 \
+-u \
+-H \
+-P \
+-s 0:0,hostbridge \
+-l bootrom,/path/to/test.fd \
+-s 1:0,lpc \
+-s 2:0,ahci,hd:/tmp/freebsd.img \
+-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:00:00:00 \
+-s 4:0,fbuf,tcp=3D127.0.0.1:5904,password=3Ds3cr3t bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs b/te=
sts/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs
new file mode 100644
index 0000000000..421376db9e
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs
@@ -0,0 +1 @@
+dummy
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml b/tests=
/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml
new file mode 100644
index 0000000000..97925a74fc
--- /dev/null
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml
@@ -0,0 +1,26 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory>219136</memory>
+  <vcpu>1</vcpu>
+  <os>
+    <type>hvm</type>
+    <loader readonly=3D"yes" type=3D"pflash">/path/to/test.fd</loader>
+  </os>
+  <devices>
+    <disk type=3D'file'>
+      <driver name=3D'file' type=3D'raw'/>
+      <source file=3D'/tmp/freebsd.img'/>
+      <target dev=3D'hda' bus=3D'sata'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'2' unit=
=3D'0'/>
+    </disk>
+    <interface type=3D'bridge'>
+      <model type=3D'virtio'/>
+      <source bridge=3D"virbr0"/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <graphics type=3D'vnc' port=3D'5904' passwd=3D"s3cr3t">
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index d4c4275702..def2acc15c 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -166,7 +166,8 @@ mymain(void)
     driver.bhyvecaps =3D BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | \
                        BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \
                        BHYVE_CAP_FBUF | BHYVE_CAP_XHCI | \
-                       BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA;
+                       BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA | \
+                       BHYVE_CAP_VNC_PASSWORD;
=20
     DO_TEST("base");
     DO_TEST("wired");
@@ -198,6 +199,8 @@ mymain(void)
     DO_TEST("vnc-vgaconf-io");
     DO_TEST("vnc-autoport");
     DO_TEST("vnc-resolution");
+    DO_TEST("vnc-password");
+    DO_TEST_FAILURE("vnc-password-comma");
     DO_TEST("cputopology");
     DO_TEST_FAILURE("cputopology-nvcpu-mismatch");
     DO_TEST("commandline");
@@ -250,6 +253,9 @@ mymain(void)
     driver.bhyvecaps &=3D ~BHYVE_CAP_SOUND_HDA;
     DO_TEST_FAILURE("sound");
=20
+    driver.bhyvecaps &=3D ~BHYVE_CAP_VNC_PASSWORD;
+    DO_TEST_FAILURE("vnc-password");
+
     virObjectUnref(driver.caps);
     virObjectUnref(driver.xmlopt);
     virPortAllocatorRangeFree(driver.remotePorts);
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml b/t=
ests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml
new file mode 100644
index 0000000000..6786e10ab9
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml
@@ -0,0 +1,44 @@
+<domain type=3D'bhyve'>
+  <name>bhyve</name>
+  <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64'>hvm</type>
+    <loader readonly=3D'yes' type=3D'pflash'>/path/to/test.fd</loader>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'file' type=3D'raw'/>
+      <source file=3D'/tmp/freebsd.img'/>
+      <target dev=3D'hda' bus=3D'sata'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'2' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'isa' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <interface type=3D'bridge'>
+      <mac address=3D'52:54:00:00:00:00'/>
+      <source bridge=3D'virbr0'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <graphics type=3D'vnc' port=3D'5904' autoport=3D'no' listen=3D'127.0.0=
.1' passwd=3D's3cr3t'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'gop' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+  </devices>
+</domain>
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c
index b266e8b934..8808d5a8fa 100644
--- a/tests/bhyvexml2xmltest.c
+++ b/tests/bhyvexml2xmltest.c
@@ -107,6 +107,7 @@ mymain(void)
     DO_TEST_DIFFERENT("vnc-vgaconf-io");
     DO_TEST_DIFFERENT("vnc-autoport");
     DO_TEST_DIFFERENT("vnc-resolution");
+    DO_TEST_DIFFERENT("vnc-password");
     DO_TEST_DIFFERENT("commandline");
     DO_TEST_DIFFERENT("msrs");
     DO_TEST_DIFFERENT("sound");
--=20
2.27.0