From nobody Fri Oct 18 06:16:21 2024 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1718609804016331.95206047353986; Mon, 17 Jun 2024 00:36:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BE45D1289; Mon, 17 Jun 2024 03:36:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id CE0E7123C; Mon, 17 Jun 2024 03:36:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 95057122B; Mon, 17 Jun 2024 03:36:21 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 2525B11B3 for ; Mon, 17 Jun 2024 03:36:21 -0400 (EDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-7uIOHstANNOAJQtXZqPUmw-1; Mon, 17 Jun 2024 03:36:18 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4212e2a3a1bso26333295e9.3 for ; Mon, 17 Jun 2024 00:36:18 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422874e7060sm187700005e9.40.2024.06.17.00.36.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 00:36:16 -0700 (PDT) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 6BAE81C69CE3C for ; Mon, 17 Jun 2024 09:36:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718609780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cd7o4E7mVTpDF48XdcBnYqUr8TPhxTNOQpHEz//ZPWU=; b=JQtvzt0I0CI7dcSdAi+Hf9RmChtIZQNrrCrxwTN5WpQ9CMpveUTC3whBxinUgTG5dQCjL9 Z0NGGDow2pr3XZYIcV4N3PbdmWisTwQ9Qyx78UUagghSPv2pLdm6PmTjzmQaCtCHcfYpNX tQCh8KZDrNprpMtCvlvYA4MXm7pFGQI= X-MC-Unique: 7uIOHstANNOAJQtXZqPUmw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718609777; x=1719214577; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cd7o4E7mVTpDF48XdcBnYqUr8TPhxTNOQpHEz//ZPWU=; b=kBv0P575gFc4n4u08hgsXVMjCTmZm/Z3xTJTqWKnyKrmcCSSAzePfnaNq5/4GCrrJc uFjwJfrzbRI0wliYLHPsVLwHG8cpwuPU4LhWinffDwvl1IzfzJqPT+G/y2CMzjhoh+Vi Jd/5SdxFQwFk5HKwFpf80V0Peh8SgJmSvqyGiHc8e4rrBv2FykzxVrWsRihO44KhhaD+ +ybtBRXlSD45gL5R/QOdQOm6hyZx1Bj9wutzc7W9GUdSUqOy8JQeUFB5x0MHz6xnMj/y +Ctw0zACRCjquY8E/10JPj1lfVo4pJurDYSjWTjPXvNGdWGORIRtqnrBcR0d1kqGdW3Q eZhg== X-Gm-Message-State: AOJu0Yx7UIBEXz/PtyCKork4l43gtWIbB2HszYYng4xAPMIPsR87NPwY nLjqOi9id1uuSCSbX/rqqLnN1tUnXsGbq4kmECKie4dJiZ45XfO2kodKC13tOYGynKoaHz9oRZh 7jdvuU44w7znDRlbmDZ6bTT15wOrva3JnNivYsI8qhLRBEzxRxxacWF2zCec6QeUO67P2YqYdst je5kdbdVy54gxe8/SYKP2YRwcca/6MCm5d7MuKBUU= X-Received: by 2002:a05:600c:45cd:b0:421:7eff:efb8 with SMTP id 5b1f17b1804b1-423056e01dbmr71704105e9.31.1718609777509; Mon, 17 Jun 2024 00:36:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwGqafHRQhX/iBTxJDbxBKpZB9Ni98hG/oUAqm2jHvygKlB3e9ca5rd5Nm8f6yYe1qYMRmgw== X-Received: by 2002:a05:600c:45cd:b0:421:7eff:efb8 with SMTP id 5b1f17b1804b1-423056e01dbmr71703965e9.31.1718609776991; Mon, 17 Jun 2024 00:36:16 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH] vmx: Accept more serial variations Date: Mon, 17 Jun 2024 09:36:04 +0200 Message-ID: <6376e890db0dde68e6443d8c09a39f604321aee1.1718609764.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DPYV2AXXS5UTO37B4VSC54H327GWVRHI X-Message-ID-Hash: DPYV2AXXS5UTO37B4VSC54H327GWVRHI X-MailFrom: mkletzan@redhat.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 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: 1718609809504100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Commit 23c47944882b added parsing of serial ports connected to vspc, but the VM can also have a network serial port with an empty filename or no filename at all. Parse these the same way, as a . Resolves: https://issues.redhat.com/browse/RHEL-32182 Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Richard W.M. Jones --- src/vmx/vmx.c | 2 +- tests/vmx2xmldata/esx-in-the-wild-13.vmx | 4 ++++ tests/vmx2xmldata/esx-in-the-wild-13.xml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d90b41d2ad14..d082a0766010 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3065,7 +3065,7 @@ virVMXParseSerial(virVMXContext *ctx, virConf *conf, = int port, (*def)->target.port =3D port; (*def)->source->type =3D VIR_DOMAIN_CHR_TYPE_PIPE; (*def)->source->data.file.path =3D g_steal_pointer(&fileName); - } else if (STRCASEEQ(fileType, "network") && vspc) { + } else if (STRCASEEQ(fileType, "network") && (vspc || !fileName || STR= EQ(fileName, ""))) { (*def)->target.port =3D port; (*def)->source->type =3D VIR_DOMAIN_CHR_TYPE_NULL; } else if (STRCASEEQ(fileType, "network")) { diff --git a/tests/vmx2xmldata/esx-in-the-wild-13.vmx b/tests/vmx2xmldata/e= sx-in-the-wild-13.vmx index 1016acab28d8..d67e01814e93 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-13.vmx +++ b/tests/vmx2xmldata/esx-in-the-wild-13.vmx @@ -29,6 +29,10 @@ serial0.fileName =3D "ZmVybmV0IGdBQUFBQUJrdFotaW8yclpkRX= R6N3dBcDdyYkFMaWFUMVd4RENJ serial0.vspc =3D "telnets://10.28.100.26:18979#thumbprint=3D18:F5:79:E5:73= :A5:22:83:C0:57:B9:B4:FA:CE:60:19:F1:12:F5:7B" serial0.yieldOnMsrRead =3D "TRUE" serial0.present =3D "TRUE" +serial1.fileType =3D "network" +serial1.fileName =3D "" +serial1.yieldOnMsrRead =3D "TRUE" +serial1.present =3D "TRUE" displayName =3D "Test-Mig-VM-1 (01ce57d0-4e20-41a5-8b6c-bcbf49a032ec)" annotation =3D "name:Test-Mig-VM-1|0Auserid:962314ba515c48388a0e95c0961709= ff|0Ausername:admin|0Aprojectid:b06b5f77b6bb442f85b1c67cff980ef9|0Aprojectn= ame:MIS|0Aflavor:name:mig-test-flavor|0Aflavor:memory_mb:1024|0Aflavor:vcpu= s:1|0Aflavor:ephemeral_gb:0|0Aflavor:root_gb:10|0Aflavor:swap:0|0Aimageid:8= b90d6fa-20ab-4adf-8015-aad3dddb246c|0Apackage:20.6.2|0A" guestOS =3D "other-64" diff --git a/tests/vmx2xmldata/esx-in-the-wild-13.xml b/tests/vmx2xmldata/e= sx-in-the-wild-13.xml index 552c9a2a1a26..e6ef947d501f 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-13.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-13.xml @@ -43,6 +43,9 @@ package:20.6.2 + + + --=20 2.45.1