From nobody Fri Dec 19 20:24:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174681090408077.5094298266497; Fri, 9 May 2025 10:15:04 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7CB5817D6; Fri, 9 May 2025 13:15:03 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 73E321790; Fri, 9 May 2025 13:13:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AC878178D; Fri, 9 May 2025 13:13:13 -0400 (EDT) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2480517BC for ; Fri, 9 May 2025 13:13:02 -0400 (EDT) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5fbe7a65609so3905660a12.0 for ; Fri, 09 May 2025 10:13:02 -0700 (PDT) Received: from tulp.my.domain (80-115-115-199.cable.dynamic.v4.ziggo.nl. [80.115.115.199]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fcb3773b04sm581106a12.10.2025.05.09.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 10:12:59 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746810780; x=1747415580; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LEXfghiyWg7FKsKa4I/AvZnqgUSVDeYCmrUVziMmnjU=; b=DXTuYV32ALNEzrF6pCYaYqcykx8yyOREt5kTdYo5OXlTSJUv+OBoOOpVDuixYkTok/ 5zk6Eluui99nSxPitPJmCRfZbCLIuR2Zi7XUtGajLurYZI+F6FM6ccmzBxJvOQMTg74F GnesGRBHwvaAa+hE2wNflXty4Of/xdArTLh5WZFMTa92UBZhbBHVTQ743HAakrOBsbIp fjlwB1qcC6xf+Z7sgoWk33XC8+egOJb3K0bhj2Q3GOzj/tPom7RhquEQs04e0nas1ZAi uj8zxa5CL0IlUy4p9PmC9KNlxRsjn3gn0gUYUUPeH3QDau+u0tZiugsVrBM6jZqDqlLM dO/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746810780; x=1747415580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEXfghiyWg7FKsKa4I/AvZnqgUSVDeYCmrUVziMmnjU=; b=koxOhcqx0U6hVpTo0TaqQgA/MHTOuLZYDL0eZAuEdM3XJzqUaOK5JoaJDtf+Me3U4V NWrjh15lFlkyLcOS4VB3ysyC4woMMr7sPq0EqKwtCe0A5+5FfZK631E4C6xaRoZuICS4 1dgUqutJHL+PSjuDBOoldQai0UxWrICX4ZKU15xdsk5LTtNFF5oKKa0w5MGJooG70yTd IIzDumhKNw+EaaCRQUTLU0NdrntdKaUhYYoWSwuDxiwXWY8BAoh8wp92uEQwNVrGFobO Md42C3Qi4GtKK1ujk0Fc+ltsp0jdO6c77nhYLDdzBexBx83x5m6eMMsMqW3kMhhk4jGD 4CRg== X-Gm-Message-State: AOJu0YxdZNVQhLrhTJvadymy+lGbPttkMlAKRV7SyzoqfzeMZnvzpP8a YxoEVpoZGNs05AzEuAnI9RESxMErHumLWIJnH6+8H46E78rkMu0fluRaqPuoUCzjsQ== X-Gm-Gg: ASbGncv5qhaytKbPLvZ2EP/w4DSPG5lq08Vh188QffK6JS6KuqDK3XvcrUe/S4aPAFM uiTRQs1kZzuUhKm9ozWoTxKGNnn+uv5+XqmnRQhxKUQrBa0klAck05M4vOOJj2yE16HXBr+KPIm qSBEiVabEcV4+8UhTbcLJuUt47pBF3P66Z29ms/rljNmkbdnI/6eDfamMR8QFuhPw8DAHC784Qa 3zJ071R0jiPEjAIVvE/5+na7BxKNoJD0TX8Eq2Vu8PmkkDkMpY6X2M8ZrDk3pqMnk2c9pn55w9V 1Dh/TwGZIGcJhl3mOuYjGAwCnUdtsZkA0SFT9S1lSJErjHUziiroajOkl1T4fW5OWmHNljaXRaH N7FY7icbAZ6EQ2w== X-Google-Smtp-Source: AGHT+IHJt01lMZuz5iyVhzv1BWTDlqSaA63VDGOWqZgg3FSV+FjSO+MvsvxsB8KQbNQuZcpImjNNww== X-Received: by 2002:a05:6402:354e:b0:5f7:eaf0:8849 with SMTP id 4fb4d7f45d1cf-5fca0770858mr3543801a12.16.1746810780396; Fri, 09 May 2025 10:13:00 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/5] bhyve: firmware: try to guess NVRAM settings Date: Fri, 9 May 2025 19:11:49 +0200 Message-ID: <20250509171151.31305-4-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250509171151.31305-1-bogorodskiy@gmail.com> References: <20250509171151.31305-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VNHXWCIUFYAUW6GF2HIZZITIIN3Q5VTZ X-Message-ID-Hash: VNHXWCIUFYAUW6GF2HIZZITIIN3Q5VTZ X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746810906501019000 Content-Type: text/plain; charset="utf-8" Extend bhyveFirmwareFillDomain() so that when we find the default edk2 firmware, also look for its matching template file, and use it as a nvramTemplate if found. Extend bhyvexml2argvtest to verify various NVRAM configurations. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_firmware.c | 119 +++++++++++++++--- ...gv-uefi-nvram-template-and-source-set.args | 12 ++ ...-uefi-nvram-template-and-source-set.ldargs | 1 + ...rgv-uefi-nvram-template-and-source-set.xml | 24 ++++ ...bhyvexml2argv-uefi-nvram-template-set.args | 12 ++ ...yvexml2argv-uefi-nvram-template-set.ldargs | 1 + .../bhyvexml2argv-uefi-nvram-template-set.xml | 24 ++++ .../bhyvexml2argv-uefi-nvram.args | 12 ++ .../bhyvexml2argv-uefi-nvram.ldargs | 1 + .../bhyvexml2argv-uefi-nvram.xml | 24 ++++ tests/bhyvexml2argvtest.c | 5 + 11 files changed, 221 insertions(+), 14 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-and-source-set.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-and-source-set.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-and-source-set.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-set.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-set.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-set.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c index 8aaf05dc62..35a1097e5d 100644 --- a/src/bhyve/bhyve_firmware.c +++ b/src/bhyve/bhyve_firmware.c @@ -1,7 +1,9 @@ /* * bhyve_firmware.c: bhyve firmware management * + * Copyright (C) 2019 Red Hat, Inc. * Copyright (C) 2021 Roman Bogorodskiy + * Copyright (C) 2025 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +27,7 @@ #include "viralloc.h" #include "virlog.h" #include "virfile.h" +#include "virstring.h" #include "bhyve_conf.h" #include "bhyve_firmware.h" =20 @@ -34,6 +37,76 @@ VIR_LOG_INIT("bhyve.bhyve_firmware"); =20 =20 #define BHYVE_DEFAULT_FIRMWARE "BHYVE_UEFI.fd" +#define BHYVE_DEFAULT_NVRAM_TEMPLATE "BHYVE_UEFI_VARS.fd" + +static void +bhyveFirmwareEnsureNVRAM(virDomainDef *def, + bhyveConn *driver) +{ + g_autoptr(virBhyveDriverConfig) cfg =3D virBhyveDriverGetConfig(driver= ); + virDomainLoaderDef *loader =3D def->os.loader; + const char *ext =3D NULL; + + if (!loader) + return; + + if (loader->type !=3D VIR_DOMAIN_LOADER_TYPE_PFLASH) + return; + + if (loader->readonly !=3D VIR_TRISTATE_BOOL_YES) + return; + + if (loader->stateless =3D=3D VIR_TRISTATE_BOOL_YES) + return; + + /* If the NVRAM format hasn't been set yet, inherit the same as + * the loader */ + if (loader->nvram && !loader->nvram->format) + loader->nvram->format =3D loader->format; + + if (loader->nvram) { + /* Nothing to do if a proper NVRAM backend is already configured */ + if (!virStorageSourceIsEmpty(loader->nvram)) + return; + + /* otherwise we want to reset and re-populate the definition */ + virObjectUnref(loader->nvram); + } else { + /* Also do nothing if NVRAM is not requested */ + return; + } + + loader->nvram =3D virStorageSourceNew(); + loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; + + /* The nvram template format should be always present but as a failsaf= e, + * duplicate the loader format if it is not available. */ + if (loader->nvramTemplateFormat > VIR_STORAGE_FILE_NONE) + loader->nvram->format =3D loader->nvramTemplateFormat; + else + loader->nvram->format =3D loader->format; + + /* The extension used by raw edk2 builds has historically + * been .fd, but more recent aarch64 builds have started + * using the .raw extension instead. + * + * If we're defining a new domain, we should try to match the + * extension for the file backing its NVRAM store with the + * one used by the template to keep things nice and + * consistent. + * + * If we're loading an existing domain, however, we need to + * stick with the .fd extension to ensure compatibility */ + if (loader->nvramTemplate && + virStringHasSuffix(loader->nvramTemplate, ".raw")) + ext =3D ".raw"; + else + ext =3D ".fd"; + + loader->nvram->path =3D g_strdup_printf("%s/%s_VARS%s", + cfg->nvramDir, def->name, + NULLSTR_EMPTY(ext)); +} =20 int bhyveFirmwareFillDomain(bhyveConn *driver, @@ -42,25 +115,31 @@ bhyveFirmwareFillDomain(bhyveConn *driver, { g_autoptr(DIR) dir =3D NULL; g_autoptr(virBhyveDriverConfig) cfg =3D virBhyveDriverGetConfig(driver= ); + virDomainLoaderDef *loader =3D def->os.loader; const char *firmware_dir =3D cfg->firmwareDir; struct dirent *entry; g_autofree char *matching_firmware =3D NULL; + g_autofree char *matching_nvram_template =3D NULL; g_autofree char *first_found =3D NULL; =20 virCheckFlags(0, -1); =20 if (def->os.firmware =3D=3D VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) - return 0; + goto out; =20 if (virDirOpenIfExists(&dir, firmware_dir) > 0) { while ((virDirRead(dir, &entry, firmware_dir)) > 0) { if (g_str_has_prefix(entry->d_name, ".")) continue; =20 - if (STREQ(entry->d_name, BHYVE_DEFAULT_FIRMWARE)) { + if (!matching_firmware && + STREQ(entry->d_name, BHYVE_DEFAULT_FIRMWARE)) matching_firmware =3D g_strdup(entry->d_name); - break; - } + + if (!matching_nvram_template && + STREQ(entry->d_name, BHYVE_DEFAULT_NVRAM_TEMPLATE)) + matching_nvram_template =3D g_strdup(entry->d_name); + if (!first_found) first_found =3D g_strdup(entry->d_name); } @@ -77,25 +156,37 @@ bhyveFirmwareFillDomain(bhyveConn *driver, } } =20 - if (!def->os.loader) - def->os.loader =3D virDomainLoaderDefNew(); + if (!loader) { + loader =3D virDomainLoaderDefNew(); + def->os.loader =3D loader; + } =20 - if (!def->os.loader->format) - def->os.loader->format =3D VIR_STORAGE_FILE_RAW; + if (!loader->format) + loader->format =3D VIR_STORAGE_FILE_RAW; =20 - if (def->os.loader->format !=3D VIR_STORAGE_FILE_RAW) { + if (loader->format !=3D VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported loader format '%1$s'"), - virStorageFileFormatTypeToString(def->os.loader->fo= rmat)); + virStorageFileFormatTypeToString(loader->format)); return -1; } =20 - def->os.loader->type =3D VIR_DOMAIN_LOADER_TYPE_PFLASH; - def->os.loader->readonly =3D VIR_TRISTATE_BOOL_YES; + if (!loader->nvramTemplate + && matching_firmware && matching_nvram_template) { + loader->nvramTemplate =3D g_build_filename(firmware_dir, + matching_firmware, + NULL); + } + + loader->type =3D VIR_DOMAIN_LOADER_TYPE_PFLASH; + loader->readonly =3D VIR_TRISTATE_BOOL_YES; + + VIR_FREE(loader->path); =20 - VIR_FREE(def->os.loader->path); + loader->path =3D g_build_filename(firmware_dir, matching_firmware, NUL= L); =20 - def->os.loader->path =3D g_build_filename(firmware_dir, matching_firmw= are, NULL); + out: + bhyveFirmwareEnsureNVRAM(def, driver); =20 return 0; } diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-= source-set.args b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template= -and-source-set.args new file mode 100644 index 0000000000..05a9e8df2c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-= set.args @@ -0,0 +1,12 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd,/path/to/nvram/guest_VARS.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 \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-= source-set.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-templa= te-and-source-set.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-= set.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-= source-set.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-= and-source-set.xml new file mode 100644 index 0000000000..cdcbfd081c --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-and-source-= set.xml @@ -0,0 +1,24 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + /path/to/test.fd + /path/to/nvram/guest_VARS.fd= + + + + + + +
+ + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.= args b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.args new file mode 100644 index 0000000000..0d367e99f1 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.args @@ -0,0 +1,12 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd,fakenvramdir/bhyve_VARS.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 \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.= ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.ldar= gs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.= xml b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.xml new file mode 100644 index 0000000000..c05dd4ff95 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram-template-set.xml @@ -0,0 +1,24 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + /path/to/test.fd + + + + + + + +
+ + + + +
+ + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args b/tests/= bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args new file mode 100644 index 0000000000..0d367e99f1 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.args @@ -0,0 +1,12 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd,fakenvramdir/bhyve_VARS.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 \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs b/test= s/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml b/tests/b= hyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml new file mode 100644 index 0000000000..bec38ad65d --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi-nvram.xml @@ -0,0 +1,24 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + /path/to/test.fd + + + + + + + +
+ + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 3831f0c65d..58b404ca7d 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -148,6 +148,7 @@ mymain(void) { int ret =3D 0; g_autofree char *fakefirmwaredir =3D g_strdup("fakefirmwaredir"); + g_autofree char *fakenvramdir =3D g_strdup("fakenvramdir"); g_autofree char *fakefirmwareemptydir =3D g_strdup("fakefirmwareemptyd= ir"); =20 if ((driver.caps =3D virBhyveCapsBuild()) =3D=3D NULL) @@ -163,6 +164,7 @@ mymain(void) return EXIT_FAILURE; =20 driver.config->firmwareDir =3D fakefirmwaredir; + driver.config->nvramDir =3D fakenvramdir; =20 # define DO_TEST_FULL(name, flags) \ do { \ @@ -218,6 +220,9 @@ mymain(void) DO_TEST("localtime"); DO_TEST("net-e1000"); DO_TEST("uefi"); + DO_TEST("uefi-nvram"); + DO_TEST("uefi-nvram-template-set"); + DO_TEST("uefi-nvram-template-and-source-set"); DO_TEST("vnc"); DO_TEST("vnc-vgaconf-on"); DO_TEST("vnc-vgaconf-off"); --=20 2.49.0