From nobody Tue Dec 16 13:06:14 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1726070662398652.7255925141069; Wed, 11 Sep 2024 09:04:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1455815CF; Wed, 11 Sep 2024 12:04:21 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E091B146D; Wed, 11 Sep 2024 12:03:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3759E145A; Wed, 11 Sep 2024 12:03:48 -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 2F7B4145C for ; Wed, 11 Sep 2024 12:03:47 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-8eYYP1rYOz-463AhGWL0Fw-1; Wed, 11 Sep 2024 12:03:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 424F918E6A70 for ; Wed, 11 Sep 2024 16:03:22 +0000 (UTC) Received: from cash.home.annexia.org (unknown [10.42.28.10]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 35A4719560B0; Wed, 11 Sep 2024 16:03:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE 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=1726070626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iped0YQJmYXnvcpbt3Yecr5Sf5R/qUQP8AQlcyuzY1o=; b=jDcq6aCMzr1Ecmx5NYESZjrlkKYGAgcgXr+jXpWfMFAt7lgBATMXB9lP9yZ30uWWbBh8Oz mK2//KHP3UAV0+0jkAjbTb+CaWTKhY10TWnmBayHTfIYdSfhd9k7ngjl0IqBWqGEnCkSPG j8xLBsMNfoBYrfYGGVn7vzlvWP0xLcw= X-MC-Unique: 8eYYP1rYOz-463AhGWL0Fw-1 From: "Richard W.M. Jones" To: devel@lists.libvirt.org Cc: berrange@redhat.com Subject: [PATCH] vmx: Allow '*' to appear in VMX file keys Date: Wed, 11 Sep 2024 17:03:16 +0100 Message-ID: <20240911160319.3921520-1-rjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3LABIOC4F4A3CUPQRK3GW5AO2U2WQRYX X-Message-ID-Hash: 3LABIOC4F4A3CUPQRK3GW5AO2U2WQRYX X-MailFrom: rjones@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: 1726070664358116600 Content-Type: text/plain; charset="utf-8"; x-default="true" When connecting to a VMware server (eg using vpx://) we download and try to parse the VMware metadata '*.vmx' file of a guest. In this case a VMX file was found which contained this key: pciPassthru*.present =3D "False" The '*' character was not previously allowed in keys so this failed to parse with the error: VIR_ERR_CONF_SYNTAX: VIR_FROM_CONF: configuration file syntax error: memory conf:74: expecting an assignment Resolves: https://issues.redhat.com/browse/RHEL-58446 Thanks: Daniel Berrange Signed-off-by: Richard W.M. Jones Reviewed-by: Pavel Hrdina --- src/util/virconf.c | 2 +- tests/vmx2xmldata/esx-in-the-wild-14.vmx | 109 +++++++++++++++++++++++ tests/vmx2xmldata/esx-in-the-wild-14.xml | 35 ++++++++ tests/vmx2xmltest.c | 1 + 4 files changed, 146 insertions(+), 1 deletion(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 66b3e0482e..c820c94037 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -553,7 +553,7 @@ virConfParseName(virConfParserCtxt *ctxt) while ((ctxt->cur < ctxt->end) && (g_ascii_isalnum(CUR) || (CUR =3D=3D '_') || ((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && - ((CUR =3D=3D ':') || (CUR =3D=3D '.') || (CUR =3D=3D '-'))) || + ((CUR =3D=3D ':') || (CUR =3D=3D '.') || (CUR =3D=3D '-') || = (CUR =3D=3D '*'))) || ((ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT) && (CUR =3D=3D '.')))) NEXT; diff --git a/tests/vmx2xmldata/esx-in-the-wild-14.vmx b/tests/vmx2xmldata/e= sx-in-the-wild-14.vmx new file mode 100644 index 0000000000..1b06352348 --- /dev/null +++ b/tests/vmx2xmldata/esx-in-the-wild-14.vmx @@ -0,0 +1,109 @@ +.encoding =3D "UTF-8" +displayName =3D "wild14" +config.version =3D "8" +virtualHW.version =3D "19" +nvram =3D "wild14.nvram" +pciBridge0.present =3D "TRUE" +svga.present =3D "TRUE" +pciBridge4.present =3D "TRUE" +pciBridge4.virtualDev =3D "pcieRootPort" +pciBridge4.functions =3D "8" +pciBridge5.present =3D "TRUE" +pciBridge5.virtualDev =3D "pcieRootPort" +pciBridge5.functions =3D "8" +pciBridge6.present =3D "TRUE" +pciBridge6.virtualDev =3D "pcieRootPort" +pciBridge6.functions =3D "8" +pciBridge7.present =3D "TRUE" +pciBridge7.virtualDev =3D "pcieRootPort" +pciBridge7.functions =3D "8" +vmci0.present =3D "TRUE" +hpet0.present =3D "TRUE" +numvcpus =3D "12" +memSize =3D "32768" +vm.createDate =3D "1661219530463754" +scsi0.virtualDev =3D "pvscsi" +scsi0.present =3D "TRUE" +annotation =3D "execution env sandbox automation platform" +guestOS =3D "rhel7-64" +uuid.bios =3D "42 1b 22 3a f2 c1 c7 c9-a3 99 34 d2 d9 fd e2 6d" +vc.uuid =3D "50 1b 83 1e 75 d8 15 f8-36 fa b9 e2 25 f3 95 aa" +migrate.hostLog =3D "wild14.hlog" +disk.EnableUUID =3D "true" +guestinfo.Vrm.Server.Host =3D "wild14.local" +numa.autosize.cookie =3D "120012" +numa.autosize.vcpu.maxPerVirtualNode =3D "12" +sched.swap.derivedName =3D "/vmfs/volumes/64e4b8e0/wild/wild14.vswp" +pciBridge0.pciSlotNumber =3D "17" +pciBridge4.pciSlotNumber =3D "21" +pciBridge5.pciSlotNumber =3D "22" +pciBridge6.pciSlotNumber =3D "23" +pciBridge7.pciSlotNumber =3D "24" +scsi0.pciSlotNumber =3D "160" +vmci0.pciSlotNumber =3D "32" +scsi0.sasWWID =3D "50 05 05 6a f2 c1 c7 c0" +vmci0.id =3D "-637672851" +svga.vramSize =3D "8388608" +monitor.phys_bits_used =3D "45" +vmotion.checkpointFBSize =3D "8388608" +vmotion.checkpointSVGAPrimarySize =3D "8388608" +softPowerOff =3D "FALSE" +svga.guestBackedPrimaryAware =3D "TRUE" +tools.syncTime =3D "FALSE" +guestOS.detailed.data =3D "architecture=3D'X86' bitness=3D'64' distroName= =3D'Red Hat Enterprise Linux' distroVersion=3D'8.8' familyName=3D'Linux' ke= rnelVersion=3D'4.18.0-477.21.1.el8_8.x86_64' prettyName=3D'Red Hat Enterpri= se Linux 8.8 (Ootpa)'" +tools.remindInstall =3D "TRUE" +config.readOnly =3D "FALSE" +guestInfo.detailed.data =3D "architecture=3D'X86' bitness=3D'64' cpeString= =3D'cpe:/o:redhat:enterprise_linux:8::baseos' distroAddlVersion=3D'8.10 (Oo= tpa)' distroName=3D'Red Hat Enterprise Linux' distroVersion=3D'8.10' family= Name=3D'Linux' kernelVersion=3D'4.18.0-553.8.1.el8_10.x86_64' prettyName=3D= 'Red Hat Enterprise Linux 8.10 (Ootpa)'" +log.keepOld =3D "10" +tools.setInfo.sizeLimit =3D "1048576" +RemoteDisplay.maxConnections =3D "1" +isolation.tools.diskWiper.disable =3D "True" +isolation.tools.vmxDnDVersionGet.disable =3D "True" +isolation.tools.copy.disable =3D "true" +isolation.device.connectable.disable =3D "True" +tools.guestlib.enableHostInfo =3D "False" +isolation.device.edit.disable =3D "True" +isolation.tools.setGUIOptions.enable =3D "False" +pciPassthru*.present =3D "False" +isolation.tools.dnd.disable =3D "true" +log.rotateSize =3D "1024000" +isolation.tools.paste.disable =3D "True" +isolation.tools.diskShrink.disable =3D "True" +time.synchronize.restore =3D "False" +time.synchronize.resume.disk =3D "False" +time.synchronize.tools.startup =3D "False" +time.synchronize.continue =3D "False" +time.synchronize.shrink =3D "False" +time.synchronize.tools.enable =3D "False" +mks.enable3d =3D "False" +time.synchronize.resume.host =3D "False" +ethernet0.addressType =3D "static" +ethernet0.pciSlotNumber =3D "192" +ethernet0.present =3D "TRUE" +ethernet0.uptCompatibility =3D "TRUE" +ethernet0.virtualDev =3D "vmxnet3" +floppy0.present =3D "FALSE" +ide0:0.deviceType =3D "atapi-cdrom" +ide0:0.present =3D "TRUE" +ide0:0.startConnected =3D "FALSE" +ethernet0.opaqueNetwork.id =3D "a2636d32-fc15-469f-b3b4-f8193fefd097" +ethernet0.opaqueNetwork.type =3D "nsx.LogicalSwitch" +ethernet0.address =3D "00:00:00:00:00:00" +vmotion.svga.mobMaxSize =3D "8388608" +vmotion.svga.graphicsMemoryKB =3D "8192" +scsi0:0.deviceType =3D "scsi-hardDisk" +scsi0:0.fileName =3D "wild1.vmdk" +sched.scsi0:0.shares =3D "normal" +sched.scsi0:0.throughputCap =3D "off" +scsi0:0.present =3D "TRUE" +scsi0:1.deviceType =3D "scsi-hardDisk" +scsi0:1.fileName =3D "wild2.vmdk" +sched.scsi0:1.shares =3D "normal" +sched.scsi0:1.throughputCap =3D "off" +scsi0:1.present =3D "TRUE" +bios.bootDelay =3D "10000" +scsi0:1.redo =3D "" +scsi0:0.redo =3D "" +ide0:0.fileName =3D "emptyBackingString" +ide0:0.clientDevice =3D "TRUE" +cleanShutdown =3D "FALSE" diff --git a/tests/vmx2xmldata/esx-in-the-wild-14.xml b/tests/vmx2xmldata/e= sx-in-the-wild-14.xml new file mode 100644 index 0000000000..dd5c2434ee --- /dev/null +++ b/tests/vmx2xmldata/esx-in-the-wild-14.xml @@ -0,0 +1,35 @@ + + wild14 + 421b223a-f2c1-c7c9-a399-34d2d9fde26d + execution env sandbox automation platform + 33554432 + 33554432 + 12 + + hvm + + + destroy + restart + destroy + + + + +
+ + + + +
+ + + + + + + + + diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 0fb5f13f72..3ca9541000 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -264,6 +264,7 @@ mymain(void) DO_TEST("esx-in-the-wild-11"); DO_TEST("esx-in-the-wild-12"); DO_TEST("esx-in-the-wild-13"); + DO_TEST("esx-in-the-wild-14"); =20 DO_TEST("gsx-in-the-wild-1"); DO_TEST("gsx-in-the-wild-2"); --=20 2.46.0