|
 |
151578 |
From 18f83f6a6945e7356a880c6b861c758e399ac55c Mon Sep 17 00:00:00 2001
|
|
|
151578 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
151578 |
Date: Wed, 11 Oct 2017 13:33:12 +0100
|
|
|
151578 |
Subject: [PATCH] v2v: -i vmx: Add a test case which lacks scsi0:0.deviceType =
|
|
|
151578 |
"scsi-hardDisk"
|
|
|
151578 |
|
|
|
151578 |
VMX file from:
|
|
|
151578 |
https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/
|
|
|
151578 |
|
|
|
151578 |
Thanks: Tom Sorensen
|
|
|
151578 |
(cherry picked from commit 6c54b68acb707d8f3dcd80453c23f57c54989be9)
|
|
|
151578 |
---
|
|
|
151578 |
v2v/test-v2v-i-vmx-5.expected | 19 ++++++++++
|
|
|
151578 |
v2v/test-v2v-i-vmx-5.vmx | 80 +++++++++++++++++++++++++++++++++++++++++++
|
|
|
151578 |
v2v/test-v2v-i-vmx.sh | 2 +-
|
|
|
151578 |
3 files changed, 100 insertions(+), 1 deletion(-)
|
|
|
151578 |
create mode 100644 v2v/test-v2v-i-vmx-5.expected
|
|
|
151578 |
create mode 100644 v2v/test-v2v-i-vmx-5.vmx
|
|
|
151578 |
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-5.expected b/v2v/test-v2v-i-vmx-5.expected
|
|
|
151578 |
new file mode 100644
|
|
|
151578 |
index 000000000..4a33db13c
|
|
|
151578 |
--- /dev/null
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-5.expected
|
|
|
151578 |
@@ -0,0 +1,19 @@
|
|
|
151578 |
+
|
|
|
151578 |
+Source guest information (--print-source option):
|
|
|
151578 |
+
|
|
|
151578 |
+ source name: MSEdge - Win10_preview
|
|
|
151578 |
+hypervisor type: vmware
|
|
|
151578 |
+ memory: 2147483648 (bytes)
|
|
|
151578 |
+ nr vCPUs: 1
|
|
|
151578 |
+ CPU features:
|
|
|
151578 |
+ firmware: bios
|
|
|
151578 |
+ display:
|
|
|
151578 |
+ video:
|
|
|
151578 |
+ sound:
|
|
|
151578 |
+disks:
|
|
|
151578 |
+ /MSEdge - Win10_preview.vmdk (vmdk) [scsi]
|
|
|
151578 |
+removable media:
|
|
|
151578 |
+
|
|
|
151578 |
+NICs:
|
|
|
151578 |
+ Bridge "ethernet0" mac: 00:0c:29:bf:e4:5d [e1000e]
|
|
|
151578 |
+
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx-5.vmx b/v2v/test-v2v-i-vmx-5.vmx
|
|
|
151578 |
new file mode 100644
|
|
|
151578 |
index 000000000..eb54d85be
|
|
|
151578 |
--- /dev/null
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx-5.vmx
|
|
|
151578 |
@@ -0,0 +1,80 @@
|
|
|
151578 |
+.encoding = "UTF-8"
|
|
|
151578 |
+config.version = "8"
|
|
|
151578 |
+virtualHW.version = "11"
|
|
|
151578 |
+memsize = "2048"
|
|
|
151578 |
+MemAllowAutoScaleDown = "FALSE"
|
|
|
151578 |
+displayName = "MSEdge - Win10_preview"
|
|
|
151578 |
+guestOS = "windows9-64"
|
|
|
151578 |
+cpuid.coresPerSocket = "1"
|
|
|
151578 |
+vmci0.present = "TRUE"
|
|
|
151578 |
+ethernet0.present = "TRUE"
|
|
|
151578 |
+ethernet0.addressType = "generated"
|
|
|
151578 |
+ethernet0.connectionType = "bridged"
|
|
|
151578 |
+ethernet0.virtualDev = "e1000e"
|
|
|
151578 |
+ethernet0.startConnected = "TRUE"
|
|
|
151578 |
+scsi0.present = "TRUE"
|
|
|
151578 |
+scsi0.virtualDev = "lsisas1068"
|
|
|
151578 |
+scsi0:0.present = "TRUE"
|
|
|
151578 |
+scsi0:0.fileName = "MSEdge - Win10_preview.vmdk"
|
|
|
151578 |
+bios.bootorder = "hdd,CDROM"
|
|
|
151578 |
+cleanshutdown = "TRUE"
|
|
|
151578 |
+ethernet0.bsdname = "en0"
|
|
|
151578 |
+ethernet0.displayname = "Ethernet"
|
|
|
151578 |
+ethernet0.linkstatepropagation.enable = "FALSE"
|
|
|
151578 |
+gui.fullscreenatpoweron = "FALSE"
|
|
|
151578 |
+gui.viewmodeatpoweron = "windowed"
|
|
|
151578 |
+hgfs.linkrootshare = "TRUE"
|
|
|
151578 |
+hgfs.maprootshare = "TRUE"
|
|
|
151578 |
+isolation.tools.hgfs.disable = "FALSE"
|
|
|
151578 |
+monitor.phys_bits_used = "42"
|
|
|
151578 |
+msg.autoanswer = "true"
|
|
|
151578 |
+numa.autosize.cookie = "10001"
|
|
|
151578 |
+numa.autosize.vcpu.maxpervirtualnode = "1"
|
|
|
151578 |
+nvram = "MSEdge - Win10_preview.nvram"
|
|
|
151578 |
+proxyapps.publishtohost = "FALSE"
|
|
|
151578 |
+remotedisplay.vnc.enabled = "FALSE"
|
|
|
151578 |
+remotedisplay.vnc.port = "5900"
|
|
|
151578 |
+replay.filename = ""
|
|
|
151578 |
+replay.supported = "FALSE"
|
|
|
151578 |
+scsi0:0.redo = ""
|
|
|
151578 |
+softpoweroff = "TRUE"
|
|
|
151578 |
+tools.synctime = "true"
|
|
|
151578 |
+uuid.action = "create"
|
|
|
151578 |
+virtualhw.productcompatibility = "hosted"
|
|
|
151578 |
+vm.genid = "-570734802784577186"
|
|
|
151578 |
+vm.genidx = "-5042519231342505152"
|
|
|
151578 |
+vmotion.checkpointfbsize = "33554432"
|
|
|
151578 |
+pciBridge0.present = "TRUE"
|
|
|
151578 |
+tools.upgrade.policy = "useGlobal"
|
|
|
151578 |
+pciBridge4.present = "TRUE"
|
|
|
151578 |
+pciBridge4.virtualDev = "pcieRootPort"
|
|
|
151578 |
+pciBridge4.functions = "8"
|
|
|
151578 |
+pciBridge5.present = "TRUE"
|
|
|
151578 |
+pciBridge5.virtualDev = "pcieRootPort"
|
|
|
151578 |
+pciBridge5.functions = "8"
|
|
|
151578 |
+pciBridge6.present = "TRUE"
|
|
|
151578 |
+pciBridge6.virtualDev = "pcieRootPort"
|
|
|
151578 |
+pciBridge6.functions = "8"
|
|
|
151578 |
+pciBridge7.present = "TRUE"
|
|
|
151578 |
+pciBridge7.virtualDev = "pcieRootPort"
|
|
|
151578 |
+pciBridge7.functions = "8"
|
|
|
151578 |
+hpet0.present = "TRUE"
|
|
|
151578 |
+extendedConfigFile = "MSEdge - Win10_preview.vmxf"
|
|
|
151578 |
+uuid.bios = "56 4d 54 59 5d 0c 51 8d-d3 40 38 4f fe bf e4 5d"
|
|
|
151578 |
+uuid.location = "56 4d 54 59 5d 0c 51 8d-d3 40 38 4f fe bf e4 5d"
|
|
|
151578 |
+migrate.hostlog = ".\MSEdge - Win10_preview-aee69569.hlog"
|
|
|
151578 |
+pciBridge0.pciSlotNumber = "17"
|
|
|
151578 |
+pciBridge4.pciSlotNumber = "21"
|
|
|
151578 |
+pciBridge5.pciSlotNumber = "22"
|
|
|
151578 |
+pciBridge6.pciSlotNumber = "23"
|
|
|
151578 |
+pciBridge7.pciSlotNumber = "24"
|
|
|
151578 |
+scsi0.pciSlotNumber = "160"
|
|
|
151578 |
+ethernet0.pciSlotNumber = "192"
|
|
|
151578 |
+vmci0.pciSlotNumber = "32"
|
|
|
151578 |
+scsi0.sasWWID = "50 05 05 69 5d 0c 51 80"
|
|
|
151578 |
+ethernet0.generatedAddress = "00:0c:29:bf:e4:5d"
|
|
|
151578 |
+ethernet0.generatedAddressOffset = "0"
|
|
|
151578 |
+vmci0.id = "-20978595"
|
|
|
151578 |
+vmotion.checkpointSVGAPrimarySize = "33554432"
|
|
|
151578 |
+toolsInstallManager.updateCounter = "1"
|
|
|
151578 |
+toolsInstallManager.lastInstallError = "21004"
|
|
|
151578 |
diff --git a/v2v/test-v2v-i-vmx.sh b/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
index 997103d41..3822e7426 100755
|
|
|
151578 |
--- a/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
+++ b/v2v/test-v2v-i-vmx.sh
|
|
|
151578 |
@@ -29,7 +29,7 @@ export VIRTIO_WIN="$top_srcdir/test-data/fake-virtio-win"
|
|
|
151578 |
|
|
|
151578 |
rm -f test-v2v-i-vmx-*.actual
|
|
|
151578 |
|
|
|
151578 |
-for i in 1 2 3 4; do
|
|
|
151578 |
+for i in 1 2 3 4 5; do
|
|
|
151578 |
$VG virt-v2v --debug-gc \
|
|
|
151578 |
-i vmx test-v2v-i-vmx-$i.vmx \
|
|
|
151578 |
--print-source > test-v2v-i-vmx-$i.actual
|
|
|
151578 |
--
|
|
|
151578 |
2.14.3
|
|
|
151578 |
|