mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
vmx: Better Workstation vmx handling
This patch adds support for vmx files with empty networkName values (which is the case for vmx generated by Workstation). It also adds support for vmx containing NATed network interfaces. Update test suite accordingly
This commit is contained in:
committed by
Matthias Bolte
parent
cff5573da2
commit
f246cdb5ac
14
tests/xml2vmxdata/xml2vmx-ethernet-nat.vmx
Normal file
14
tests/xml2vmxdata/xml2vmx-ethernet-nat.vmx
Normal file
@@ -0,0 +1,14 @@
|
||||
.encoding = "UTF-8"
|
||||
config.version = "8"
|
||||
virtualHW.version = "4"
|
||||
guestOS = "other"
|
||||
uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15"
|
||||
displayName = "ethernet-nat"
|
||||
memsize = "4"
|
||||
numvcpus = "1"
|
||||
floppy0.present = "false"
|
||||
floppy1.present = "false"
|
||||
ethernet0.present = "true"
|
||||
ethernet0.connectionType = "nat"
|
||||
ethernet0.addressType = "static"
|
||||
ethernet0.address = "00:50:56:11:22:33"
|
||||
13
tests/xml2vmxdata/xml2vmx-ethernet-nat.xml
Normal file
13
tests/xml2vmxdata/xml2vmx-ethernet-nat.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<domain type='vmware'>
|
||||
<name>ethernet-nat</name>
|
||||
<uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
|
||||
<memory>4096</memory>
|
||||
<os>
|
||||
<type>hvm</type>
|
||||
</os>
|
||||
<devices>
|
||||
<interface type='user'>
|
||||
<mac address='00:50:56:11:22:33'/>
|
||||
</interface>
|
||||
</devices>
|
||||
</domain>
|
||||
22
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
Normal file
22
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
Normal file
@@ -0,0 +1,22 @@
|
||||
.encoding = "UTF-8"
|
||||
config.version = "8"
|
||||
virtualHW.version = "8"
|
||||
guestOS = "other-64"
|
||||
uuid.bios = "dc d9 c4 36 48 25 4f c0-8f a1 14 44 4b 0f 05 69"
|
||||
displayName = "dcd9c436-4825-4fc0-8fa1-14444b0f0569"
|
||||
memsize = "512"
|
||||
numvcpus = "1"
|
||||
scsi0.present = "true"
|
||||
scsi0.virtualDev = "lsilogic"
|
||||
scsi0:0.present = "true"
|
||||
scsi0:0.deviceType = "scsi-hardDisk"
|
||||
scsi0:0.fileName = "/data/vmware/disk.vmdk"
|
||||
floppy0.present = "false"
|
||||
floppy1.present = "false"
|
||||
ethernet0.present = "true"
|
||||
ethernet0.virtualDev = "e1000"
|
||||
ethernet0.connectionType = "nat"
|
||||
ethernet0.addressType = "static"
|
||||
ethernet0.address = "00:90:B9:DC:EA:81"
|
||||
ethernet0.checkMACAddress = "false"
|
||||
svga.vramSize = "4194304"
|
||||
29
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
Normal file
29
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<domain type='vmware'>
|
||||
<name>dcd9c436-4825-4fc0-8fa1-14444b0f0569</name>
|
||||
<uuid>dcd9c436-4825-4fc0-8fa1-14444b0f0569</uuid>
|
||||
<memory>524288</memory>
|
||||
<currentMemory>524288</currentMemory>
|
||||
<vcpu>1</vcpu>
|
||||
<os>
|
||||
<type arch='x86_64'>hvm</type>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<disk type='file' device='disk'>
|
||||
<source file='/data/vmware/disk.vmdk'/>
|
||||
<target dev='sda' bus='scsi'/>
|
||||
<address type='drive' controller='0' bus='0' unit='0'/>
|
||||
</disk>
|
||||
<controller type='scsi' index='0' model='lsilogic'/>
|
||||
<interface type='user'>
|
||||
<mac address='00:90:b9:dc:ea:81'/>
|
||||
<model type='e1000'/>
|
||||
</interface>
|
||||
<video>
|
||||
<model type='vmvga' vram='4096'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
22
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
Normal file
22
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
Normal file
@@ -0,0 +1,22 @@
|
||||
.encoding = "UTF-8"
|
||||
config.version = "8"
|
||||
virtualHW.version = "8"
|
||||
guestOS = "other-64"
|
||||
uuid.bios = "dc d9 c4 36 48 25 4f c0-8f a1 14 44 4b 0f 05 69"
|
||||
displayName = "dcd9c436-4825-4fc0-8fa1-14444b0f0569"
|
||||
memsize = "512"
|
||||
numvcpus = "1"
|
||||
scsi0.present = "true"
|
||||
scsi0.virtualDev = "lsilogic"
|
||||
scsi0:0.present = "true"
|
||||
scsi0:0.deviceType = "scsi-hardDisk"
|
||||
scsi0:0.fileName = "/data/vmware/disk.vmdk"
|
||||
floppy0.present = "false"
|
||||
floppy1.present = "false"
|
||||
ethernet0.present = "true"
|
||||
ethernet0.virtualDev = "e1000"
|
||||
ethernet0.connectionType = "bridged"
|
||||
ethernet0.addressType = "static"
|
||||
ethernet0.address = "00:90:B9:DC:EA:81"
|
||||
ethernet0.checkMACAddress = "false"
|
||||
svga.vramSize = "4194304"
|
||||
30
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
Normal file
30
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<domain type='vmware'>
|
||||
<name>dcd9c436-4825-4fc0-8fa1-14444b0f0569</name>
|
||||
<uuid>dcd9c436-4825-4fc0-8fa1-14444b0f0569</uuid>
|
||||
<memory>524288</memory>
|
||||
<currentMemory>524288</currentMemory>
|
||||
<vcpu>1</vcpu>
|
||||
<os>
|
||||
<type arch='x86_64'>hvm</type>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<disk type='file' device='disk'>
|
||||
<source file='/data/vmware/disk.vmdk'/>
|
||||
<target dev='sda' bus='scsi'/>
|
||||
<address type='drive' controller='0' bus='0' unit='0'/>
|
||||
</disk>
|
||||
<controller type='scsi' index='0' model='lsilogic'/>
|
||||
<interface type='bridge'>
|
||||
<mac address='00:90:b9:dc:ea:81'/>
|
||||
<source bridge=''/>
|
||||
<model type='e1000'/>
|
||||
</interface>
|
||||
<video>
|
||||
<model type='vmvga' vram='4096'/>
|
||||
</video>
|
||||
</devices>
|
||||
</domain>
|
||||
Reference in New Issue
Block a user