From nobody Fri Dec 19 17:56:16 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 1752416776908290.82839256480406; Sun, 13 Jul 2025 07:26:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F13941315; Sun, 13 Jul 2025 10:26:15 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 84B2B1661; Sun, 13 Jul 2025 10:24:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3D7681489; Sun, 13 Jul 2025 10:24:41 -0400 (EDT) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 3153E1315 for ; Sun, 13 Jul 2025 10:24:40 -0400 (EDT) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-60c01b983b6so6558137a12.0 for ; Sun, 13 Jul 2025 07:24:40 -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-611c9734069sm4881982a12.48.2025.07.13.07.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jul 2025 07:24:36 -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=1752416678; x=1753021478; 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=B4rHVkCU2FIL+eCwqz2p1HAlYjoIxzsg73bkS73je0c=; b=Pxa1H4miD6ZFhBUVnhyp6b/QXgNOA1/U6cYjabUHV20emjojnVoojPBvFH+gBT/8dg k/OS7Tkt3jxkmdidwR0KtCGcCs54D3NmzIZHJUfKvfPDO9JqnrOAcnV9kE6ZSNzYc2Jz QXZW1cHvm41NZrgjwfBp1WpMh6ND1RSbD+iOAcrz/UtVCpvsUDQQXVq7hocvHIpZAp5A XvryPwCVI5FuEQJwXly10OBKjHSlrs9DoAC++7XHEhE+8yw3Z9Ly98tQ/CYFo8QtdcVg SjXFhcQnIapO9Cb4q/RCbCihWe6shbReWJ3kjcNArIRIwTyw/mVU1JCCQ3sVnI+Lt6Cs nohg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752416678; x=1753021478; 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=B4rHVkCU2FIL+eCwqz2p1HAlYjoIxzsg73bkS73je0c=; b=a7vJY4iQyEqTq/J/dFVqFUIdi7SGt+5Z9hs/uGrJQ3VcarQTfyFCAJGAbIpFi6yE4p YPkmI28ppFQCYREuEbc73JkbZhG5/jOcVY2kQ+8QXpdN9N/16f1o0F7WRGpbTD5KR7WU Ro937xUQGm2FD7rGC7bSWkvvrlV/WJqL9IZM3darj+nowbEnoz0r55SCuMUAbLGizufC CN66SI9xQDCsurV7ZDwgwiLJEXMhnTLw0MC88QyXs8Gp2TQmxTGA65xMgVAZ1yb5BFMz eyLF9oAh8KHIkbQBOqq9X2GjP80Ldu8lxOXVp1gFRFXGey/JOQp0TlXNpD8VWB927h3e L+eg== X-Gm-Message-State: AOJu0YygRWYaBCjSYnBR6cebsDduWqGKnWHdJtqL95xMvmru4bDPzYZ9 qg6lNC8en69H0jeGoHXk3Dzkyy/up9cXpMmOA4gfokv5d0dbgXJVspLia4KTys3osPm49A== X-Gm-Gg: ASbGncu0OEDsC2Cf7LCkDwe3Xo8ozifNSw3bhzd4ci/l3kRx0+p9m2G2ea6LszgUkyk 93vVFeKOy5/IhhvRNHSmDkhSSkKUCrzsCLFJNfE6VrGoAHq3EThpCcGLu++rNn5Xropes/mjCGc pTpjmvp9SKBPnx4FCzTZGUyTKmX2SwnYrc1YHdriL9kUGKEQfunKkbq8u2+YYVH04GZhBawlz6f j/TgxAUfjzwyIfgM4P+YGFWtuBCajeFjwdDJugdDcYjov8QMorTXm4YsFhyfOSRp3A98UF74U1X Ss0V0KgPezF93dYvSRofyy2VGfFiRRFD9H8GIW954/yxChTd1Euj5aguWS5H3vjKq6KcnvftPkJ IoC9xO0M8+86AnIq0ruQ3ehsI6xWnEjmBFN43Y+yd5+rIJ9zth+45lCALh8P2nT1CdrxNd8c= X-Google-Smtp-Source: AGHT+IFt8lXZmlAgedMwYs7skmqFhNgDjl9LejFqr+ytk7bxpi8PkIj7hULbwrqWdQ4rJ6OQRyyrYg== X-Received: by 2002:a05:6402:4407:b0:600:129:444e with SMTP id 4fb4d7f45d1cf-611e624f8aamr9259705a12.4.1752416678007; Sun, 13 Jul 2025 07:24:38 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/3] bhyve: increase number of supported consoles to 4 Date: Sun, 13 Jul 2025 16:22:06 +0200 Message-ID: <20250713142207.9647-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250713142207.9647-1-bogorodskiy@gmail.com> References: <20250713142207.9647-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RD55PKN2AEO4ABP5Q5IRDVOY525KE3YP X-Message-ID-Hash: RD55PKN2AEO4ABP5Q5IRDVOY525KE3YP 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: 1752416778167116600 Content-Type: text/plain; charset="utf-8" Recent versions of bhyve support 4 com ports instead of just 2. Thus, allow to use 4 console devices. Also, there was a bug previously because the condition was "if (chr->target.port > 2)", but as target.port start with 0 and "com" ports start with 1, this condition allows com3 to be used. As bhyve supports 4 com ports already long enough, and all supported FreeBSD versions include this capability, do not introduce driver capability for that. Add a couple of tests for that: - A domain that uses 4 serials, 2 of type 'nmdm' and the other 2 of type 'tcp' - A domain that uses unsupported port, such as target.port=3D4 which translates into com5. Signed-off-by: Roman Bogorodskiy Reviewed-by: Daniel P. Berrang=C3=A9 --- src/bhyve/bhyve_command.c | 4 +- .../bhyvexml2argv-4-consoles.args | 15 +++++ .../bhyvexml2argv-4-consoles.ldargs | 4 ++ .../bhyvexml2argv-4-consoles.xml | 35 +++++++++++ .../bhyvexml2argv-serial-invalid-port.args | 12 ++++ .../bhyvexml2argv-serial-invalid-port.ldargs | 4 ++ .../bhyvexml2argv-serial-invalid-port.xml | 28 +++++++++ tests/bhyvexml2argvtest.c | 2 + .../bhyvexml2xmlout-4-consoles.xml | 58 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 10 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-po= rt.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-po= rt.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-po= rt.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 89648f76cb..18f65cf757 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -168,8 +168,8 @@ bhyveBuildConsoleArgStr(const virDomainDef *def, virCom= mand *cmd) for (i =3D 0; i < def->nserials; i++) { chr =3D def->serials[i]; =20 - /* bhyve supports only two ports: com1 and com2 */ - if (chr->target.port > 2) { + /* bhyve supports 4 ports: com1, com2, com3, com4 */ + if (chr->target.port > 3) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("only two serial ports are supported")); return -1; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.args b/tests/= bhyvexml2argvdata/bhyvexml2argv-4-consoles.args new file mode 100644 index 0000000000..16c7bd7638 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.args @@ -0,0 +1,15 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b1:42:eb \ +-l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA \ +-l com2,tcp=3D127.0.0.1:12345 \ +-l com3,tcp=3D0.0.0.0:54321 \ +-l com4,/dev/nmdm0A \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs b/test= s/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.xml b/tests/b= hyvexml2argvdata/bhyvexml2argv-4-consoles.xml new file mode 100644 index 0000000000..4529239b1a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-4-consoles.xml @@ -0,0 +1,35 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.args= b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.args new file mode 100644 index 0000000000..8e4072d897 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.args @@ -0,0 +1,12 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b1:42:eb \ +-l com1,tcp=3D127.0.0.1:12345 \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.ldar= gs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.xml = b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.xml new file mode 100644 index 0000000000..36ecd1a9f1 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-invalid-port.xml @@ -0,0 +1,28 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + +
+ + + + + +
+ + + + + + + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index d1786ff165..2838b20c29 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -255,6 +255,8 @@ mymain(void) driver.bhyvecaps &=3D ~BHYVE_CAP_VIRTIO_RND; DO_TEST_FAILURE("virtio-rnd"); DO_TEST("serial-tcp"); + DO_TEST("4-consoles"); + DO_TEST_FAILURE("serial-invalid-port"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml b/tes= ts/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml new file mode 100644 index 0000000000..eddb88eedc --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-4-consoles.xml @@ -0,0 +1,58 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + + +
+ + + +
+ + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 0b858731a6..df093a5539 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -116,6 +116,7 @@ mymain(void) DO_TEST_DIFFERENT("fs-9p"); DO_TEST_DIFFERENT("virtio-rnd"); DO_TEST_DIFFERENT("serial-tcp"); + DO_TEST_DIFFERENT("4-consoles"); =20 /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); --=20 2.49.0