From nobody Fri Nov 21 10:11:03 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1763628362; cv=none; d=zohomail.com; s=zohoarc; b=dv0xXuQ1BL7vg6o2lmMt7Lj8ZBZHPdNEhXGH5jJGOkpBlGWj037qRnbWNPjIGzCMkc9qw04/fdljhrfLN6Nhum7oLdgXEyXxIjwwmlc/NEKMbsQEoF496cKs60poYQ6Sfh1sHQV5ChSVemr05dN3mh+CmO8BkFysf4+q5vXTLSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763628362; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=zTwkfx+dl9S0Q270palJgPFsn3XJLAzIOI6tPouZhuE=; b=nv/uoJI3tuctqD9O1LOkzrj2EOySxuesY4ywqHiRmknO0dagH8P7/50SmbGvWCsY8k2eyUhBp9OU75P+1MCtEtw5BdKXbRdDYIKvqok2JVCOV3CB6y2UBxLrEQORHKdu9W8ifzb1I+ihy4shfvXt87zC9jDgrPnrusI6HEpGxR0= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1763628359495921.9761286691667; Thu, 20 Nov 2025 00:45:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id C50F444192; Thu, 20 Nov 2025 03:45:58 -0500 (EST) Received: from [172.19.199.53] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2005A4434B; Thu, 20 Nov 2025 03:37:30 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 09BB844050; Thu, 20 Nov 2025 03:33:12 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8EF8E41BEB for ; Thu, 20 Nov 2025 03:33:11 -0500 (EST) Received: from mx-prod-mc-05.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-673-jpPJoniGMtG3h06yHCZmMQ-1; Thu, 20 Nov 2025 03:33:09 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB5B3195608E for ; Thu, 20 Nov 2025 08:33:08 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 30D341800876 for ; Thu, 20 Nov 2025 08:33:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763627591; 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: in-reply-to:in-reply-to:references:references; bh=zTwkfx+dl9S0Q270palJgPFsn3XJLAzIOI6tPouZhuE=; b=gmMivxEp0Zwt7BiWHoNkHE2YP3LZAK46hgynrEMB7/SCHsNR0ZCa9sss4Ojd11MphChQqO /tS3kkBJCfpKlPLQwgcG5762KyzaBVdO+2y8sMVNZ0QVc20AtnLKv4VqeVrfymbJULsmGC /NAzB4X4n2o9eH1QK5eWBVjnQAo2CBc= X-MC-Unique: jpPJoniGMtG3h06yHCZmMQ-1 X-Mimecast-MFC-AGG-ID: jpPJoniGMtG3h06yHCZmMQ_1763627588 To: devel@lists.libvirt.org Subject: [PATCH 9/9] vmx2xmltest: Add a test case for disks in subfolder Date: Thu, 20 Nov 2025 09:32:54 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: J0SS48eHkCDcPyLxq8IEAeT-JNaWWjPIHkWMO8Y8PpY_1763627588 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WQY22SF62QS56QQ4YLAFFWLOQKMAOTBT X-Message-ID-Hash: WQY22SF62QS56QQ4YLAFFWLOQKMAOTBT X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763628366468018900 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik This test case demonstrates correctness of the previous fix. Signed-off-by: Michal Privoznik --- tests/vmx2xmldata/esx-in-the-wild-17.vmx | 106 +++++++++++++++++++++++ tests/vmx2xmldata/esx-in-the-wild-17.xml | 46 ++++++++++ tests/vmx2xmltest.c | 1 + 3 files changed, 153 insertions(+) create mode 100644 tests/vmx2xmldata/esx-in-the-wild-17.vmx create mode 100644 tests/vmx2xmldata/esx-in-the-wild-17.xml diff --git a/tests/vmx2xmldata/esx-in-the-wild-17.vmx b/tests/vmx2xmldata/e= sx-in-the-wild-17.vmx new file mode 100644 index 0000000000..ebbf76b449 --- /dev/null +++ b/tests/vmx2xmldata/esx-in-the-wild-17.vmx @@ -0,0 +1,106 @@ +.encoding =3D "UTF-8" +config.version =3D "8" +virtualHW.version =3D "20" +vmci0.present =3D "TRUE" +floppy0.present =3D "FALSE" +svga.vramSize =3D "8388608" +numvcpus =3D "2" +memSize =3D "4096" +tools.upgrade.policy =3D "manual" +sched.cpu.units =3D "mhz" +vm.createDate =3D "1760939758649227" +usb_xhci.present =3D "TRUE" +scsi0.virtualDev =3D "lsisas1068" +scsi0.present =3D "TRUE" +sata0.present =3D "TRUE" +sata0:0.deviceType =3D "cdrom-image" +sata0:0.fileName =3D "/vmfs/volumes/f84f070c-0d65498d/win-iso/windows_11_x= 64_official_dvd.iso" +sata0:0.present =3D "TRUE" +scsi0:0.deviceType =3D "scsi-hardDisk" +scsi0:0.fileName =3D "esx8.0-win11-with-second-disk-in-subfolder.vmdk" +sched.scsi0:0.shares =3D "normal" +sched.scsi0:0.throughputCap =3D "off" +scsi0:0.present =3D "TRUE" +ethernet0.allowGuestConnectionControl =3D "FALSE" +ethernet0.virtualDev =3D "e1000e" +ethernet0.networkName =3D "Mgmt Network" +ethernet0.addressType =3D "vpx" +ethernet0.generatedAddress =3D "00:50:56:a5:b8:68" +ethernet0.present =3D "TRUE" +displayName =3D "esx8.0-win11-with-second-disk-in-subfolder" +guestOS =3D "windows2019srvNext-64" +chipset.motherboardLayout =3D "i440bx" +toolScripts.afterPowerOn =3D "TRUE" +toolScripts.afterResume =3D "TRUE" +toolScripts.beforeSuspend =3D "TRUE" +toolScripts.beforePowerOff =3D "TRUE" +tools.syncTime =3D "FALSE" +tools.guest.desktop.autolock =3D "TRUE" +uuid.bios =3D "42 25 6e c1 e0 66 93 64-3d d1 36 a0 b7 52 63 dd" +vc.uuid =3D "50 25 0f 27 53 8b 50 91-a4 3b a5 0c e9 5f 23 82" +nvram =3D "esx8.0-win11-with-second-disk-in-subfolder.nvram" +svga.present =3D "TRUE" +pciBridge0.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" +hpet0.present =3D "TRUE" +RemoteDisplay.maxConnections =3D "-1" +sched.cpu.latencySensitivity =3D "normal" +disk.EnableUUID =3D "TRUE" +vmxstats.filename =3D "esx8.0-win11-x86_64-latest.scoreboard" +numa.autosize.cookie =3D "20012" +numa.autosize.vcpu.maxPerVirtualNode =3D "2" +cpuid.coresPerSocket.cookie =3D "2" +vm.genidX =3D "2627911129287880091" +pciBridge0.pciSlotNumber =3D "17" +pciBridge4.pciSlotNumber =3D "21" +pciBridge5.pciSlotNumber =3D "22" +pciBridge6.pciSlotNumber =3D "23" +pciBridge7.pciSlotNumber =3D "24" +scsi0.pciSlotNumber =3D "160" +ethernet0.pciSlotNumber =3D "192" +usb_xhci.pciSlotNumber =3D "224" +sata0.pciSlotNumber =3D "32" +scsi0.sasWWID =3D "50 05 05 61 e0 66 93 60" +vmotion.checkpointFBSize =3D "8388608" +vmotion.checkpointSVGAPrimarySize =3D "8388608" +vmotion.svga.mobMaxSize =3D "8388608" +vmotion.svga.graphicsMemoryKB =3D "8192" +monitor.phys_bits_used =3D "45" +softPowerOff =3D "TRUE" +tools.remindInstall =3D "TRUE" +migrate.hostLog =3D "esx8.0-win11-with-second-disk-in-subfolder-1b240d0d.h= log" +sched.cpu.min =3D "0" +sched.cpu.shares =3D "normal" +sched.mem.min =3D "0" +sched.mem.minSize =3D "0" +sched.mem.shares =3D "normal" +migrate.encryptionMode =3D "opportunistic" +ftcpt.ftEncryptionMode =3D "ftEncryptionOpportunistic" +viv.moid =3D "52300e6b-6a64-4109-b144-f3efe9426650:vm-545:2azK3dLANCIEKysf= Zbstuwb/2iSvArcsaQpXPpR56RY=3D" +sched.swap.derivedName =3D "/vmfs/volumes/124778e2-48604a5f/esx8.0-win11-w= ith-second-disk-in-subfolder/esx8.0-win11-with-second-disk-in-subfolder-547= 4484f.vswp" +uuid.location =3D "56 4d 73 7b a7 00 67 05-e5 0a b7 00 56 d4 1e 54" +vm.genid =3D "3571897048718482545" +scsi0:0.redo =3D "" +scsi0:1.deviceType =3D "scsi-hardDisk" +scsi0:1.fileName =3D "subfolder/esx8.0-win11-with-second-disk-in-subfolder= _1.vmdk" +sched.scsi0:1.shares =3D "normal" +sched.scsi0:1.throughputCap =3D "off" +scsi0:1.present =3D "TRUE" +scsi0:1.redo =3D "" +vmci0.id =3D "-1219337251" +cleanShutdown =3D "TRUE" +usb_xhci:4.present =3D "TRUE" +usb_xhci:4.deviceType =3D "hid" +usb_xhci:4.port =3D "4" +usb_xhci:4.parent =3D "-1" diff --git a/tests/vmx2xmldata/esx-in-the-wild-17.xml b/tests/vmx2xmldata/e= sx-in-the-wild-17.xml new file mode 100644 index 0000000000..ae66de7431 --- /dev/null +++ b/tests/vmx2xmldata/esx-in-the-wild-17.xml @@ -0,0 +1,46 @@ + + esx8.0-win11-with-second-disk-in-subfolder + 42256ec1-e066-9364-3dd1-36a0b75263dd + 3191ed70-eb21-9c71-2478-373fb27fed9b + 4194304 + 4194304 + 2 + + 2000 + + + hvm + + + destroy + restart + destroy + + + + +
+ + + + +
+ + + + + +
+ + + + + + + + + + + diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index cb8e04af0d..fcca765bed 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -223,6 +223,7 @@ mymain(void) DO_TEST("esx-in-the-wild-14"); DO_TEST("esx-in-the-wild-15"); DO_TEST("esx-in-the-wild-16"); + DO_TEST("esx-in-the-wild-17"); =20 DO_TEST("gsx-in-the-wild-1"); DO_TEST("gsx-in-the-wild-2"); --=20 2.51.0