From nobody Tue May 7 03:54:56 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616604562; cv=none; d=zohomail.com; s=zohoarc; b=fBkEJYC8OnZiSgLGGUyiTCz68rwvBoc7F248PyY461KnhySDewDRGP+c3262jG4AWtDjBZHPg4myByhRcjKb2gg+9Fhj8/sW99hUOh8qrdHLDABoI2K7dsiArQkoOXfB0WFFPoDJp8Em7S+adXWgp071wZv9uOsZCyx+piSfNg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616604562; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=nFAMGLkcLXTmIXXh+mOBK55C+czogzxhgqxWuWSNM3c=; b=h0M+yCsFIe4Wjef6VFWHgbc/6TTZ4C/X3NVIq7HXWsAYiC38AmVGpx4Y3wHuGiEKYaOH0f8sW0XVFZKoGgg8inDqMhqzye2/t+nLcP67ApxDs8jNFKZlyYupHB0D33eU4D/LAwvVlLZ8rlcVpTmjHvDy1JqnmGSsbqmZJUHWfhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTP id 1616604562612564.9257386620654; Wed, 24 Mar 2021 09:49:22 -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-470-dZJb6Hw8NDqx_mwkSYSaYg-1; Wed, 24 Mar 2021 12:48:21 -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 EF852107ACCD; Wed, 24 Mar 2021 16:48:15 +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 139457092E; Wed, 24 Mar 2021 16:48:15 +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 6E9FE4BB7C; Wed, 24 Mar 2021 16:48:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12OGltv0005413 for ; Wed, 24 Mar 2021 12:47:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E5ABC866C7; Wed, 24 Mar 2021 16:47:55 +0000 (UTC) Received: from 48-A4-72-0B-E8-25.redhat.com (unknown [10.40.196.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10F4677360 for ; Wed, 24 Mar 2021 16:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616604504; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nFAMGLkcLXTmIXXh+mOBK55C+czogzxhgqxWuWSNM3c=; b=Z0QvpEXcHjYCZ5wtAVEwWSPCk+0jxJOmR8FtOrpjR+gjXHifvEyFheDmBlQzSiihmeNAWr AFHURGLfEr7/Tq1E/6cH55RVdOcZMxpuZih2JvdlgqD2XM4PrQNzk5l49Y3Xdr7bGX2iEz ExY8jJoa62snEzw5Pc5wjf0GixBaw1U= X-MC-Unique: dZJb6Hw8NDqx_mwkSYSaYg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] XML update in Date: Wed, 24 Mar 2021 17:47:44 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Previously, we accepted empty bridge name, because some old versions of VMWare Workstation did not put it into the config. But this doesn't make much sense - to have an interface type bridge with no name. We circumvented this problem by generating an empty name but that is equally wrong. Therefore, fill in missing bridge names (according to the documentation [1] the default bridge name is VMnet0) and error out if bridge name is missing. This partially reverts f246cdb5aca13ac9409b2ad43087e3078615ffcb 1: https://docs.vmware.com/en/VMware-Workstation-Player-for-Linux/16.0/com.= vmware.player.linux.using.doc/GUID-BAFA66C3-81F0-4FCA-84C4-D9F7D258A60A.html Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 10 +++------- tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 2 ++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 4 ++-- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.vmx | 1 + tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 2 +- tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 2 ++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 4 ++-- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 76d01a36de..82d3409c79 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2803,11 +2803,8 @@ virVMXParseEthernet(virConfPtr conf, int controller,= virDomainNetDefPtr *def) STRCASEEQ(connectionType, "bridged") || STRCASEEQ(connectionType, "custom")) { if (virVMXGetConfigString(conf, networkName_name, &networkName, - true) < 0) + false) < 0) goto cleanup; - - if (!networkName) - networkName =3D g_strdup(""); } =20 /* vmx:vnet -> def:data.ifname */ @@ -3924,9 +3921,8 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int cont= roller, /* def:type, def:ifname -> vmx:connectionType */ switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: - if (STRNEQ(def->data.bridge.brname, "")) - virBufferAsprintf(buffer, "ethernet%d.networkName =3D \"%s\"\n= ", - controller, def->data.bridge.brname); + virBufferAsprintf(buffer, "ethernet%d.networkName =3D \"%s\"\n", + controller, def->data.bridge.brname); =20 if (def->ifname !=3D NULL) { virBufferAsprintf(buffer, "ethernet%d.connectionType =3D \"cus= tom\"\n", diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx b/tests/vmx= 2xmldata/vmx2xml-fusion-in-the-wild-1.vmx index ef6af19b49..75583bdc53 100644 --- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx @@ -12,9 +12,11 @@ sound.filename =3D "-1" sound.autodetect =3D "TRUE" usb.present =3D "TRUE" ethernet0.present =3D "TRUE" +ethernet0.networkName =3D "VMnet0" ethernet0.addressType =3D "generated" ethernet0.connectionType =3D "bridged" ethernet1.present =3D "TRUE" +ethernet1.networkName =3D "VMnet0" ethernet1.addressType =3D "generated" ethernet1.connectionType =3D "bridged" scsi0:0.present =3D "TRUE" diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx= 2xmldata/vmx2xml-fusion-in-the-wild-1.xml index 2dd46eb2b1..f6e9f4acdf 100644 --- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml @@ -26,11 +26,11 @@ - + - +