External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
1f915d40a2
libvirt/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml

36 lines
1.1 KiB
XML
Raw Normal View History

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
2012-02-23 09:34:45 +00:00
<domain type='vmware'>
<name>debian6</name>
<uuid>00000000-0000-0000-0000-000000000000</uuid>
xml: output memory unit for clarity Make it obvious to 'dumpxml' readers what unit we are using, since our default of KiB for memory (1024) differs from qemu's default of MiB; and differs from our use of bytes for storage. Tests were updated via: $ find tests/*data tests/*out -name '*.xml' | \ xargs sed -i 's/<\(memory\|currentMemory\|hard_limit\|soft_limit\|min_guarantee\|swap_hard_limit\)>/<\1 unit='"'KiB'>/" $ find tests/*data tests/*out -name '*.xml' | \ xargs sed -i 's/<\(capacity\|allocation\|available\)>/<\1 unit='"'bytes'>/" followed by a few fixes for the stragglers. Note that with this patch, the RNG for <memory> still forbids validation of anything except unit='KiB', since the code silently ignores the attribute; a later patch will expand <memory> to allow scaled input in the code and update the RNG to match. * docs/schemas/basictypes.rng (unit): Add 'bytes'. (scaledInteger): New define. * docs/schemas/storagevol.rng (sizing): Use it. * docs/schemas/storagepool.rng (sizing): Likewise. * docs/schemas/domaincommon.rng (memoryKBElement): New define; use for memory elements. * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolDefFormat): Likewise. * src/conf/domain_conf.h (_virDomainDef): Document unit used internally. * src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef): Likewise. * tests/*data/*.xml: Update all tests. * tests/*out/*.xml: Likewise. * tests/define-dev-segfault: Likewise. * tests/openvzutilstest.c (testReadNetworkConf): Likewise. * tests/qemuargv2xmltest.c (blankProblemElements): Likewise.
2012-02-23 00:48:38 +00:00
<memory unit='KiB'>524288</memory>
<currentMemory unit='KiB'>524288</currentMemory>
numad: Always output 'placement' of <vcpu> <vcpu> is not an optional node. The value for its 'placement' actually always defaults to 'static' in the underlying codes. (Even no 'cpuset' and 'placement' is specified, the domain process will be pinned to all the available pCPUs).
2012-05-08 16:04:36 +00:00
<vcpu placement='static'>1</vcpu>
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
2012-02-23 09:34:45 +00:00
<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'/>
conf: Introduce new attribute for device address format * src/conf/domain_conf.h: Add new member "target" to struct _virDomainDeviceDriveAddress. * src/conf/domain_conf.c: Parse and format "target" * Lots of tests (.xml) in tests/domainsnapshotxml2xmlout, tests/qemuxml2argvdata, tests/qemuxml2xmloutdata, and tests/vmx2xmldata/ are modified for newly introduced attribute "target" for address of "drive" type.
2012-02-27 10:19:54 +00:00
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
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
2012-02-23 09:34:45 +00:00
</disk>
<disk type='file' device='cdrom'>
<source file='/usr/lib/vmware/isoimages/linux.iso'/>
<target dev='hdc' bus='ide'/>
conf: Introduce new attribute for device address format * src/conf/domain_conf.h: Add new member "target" to struct _virDomainDeviceDriveAddress. * src/conf/domain_conf.c: Parse and format "target" * Lots of tests (.xml) in tests/domainsnapshotxml2xmlout, tests/qemuxml2argvdata, tests/qemuxml2xmloutdata, and tests/vmx2xmldata/ are modified for newly introduced attribute "target" for address of "drive" type.
2012-02-27 10:19:54 +00:00
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
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
2012-02-23 09:34:45 +00:00
</disk>
<controller type='scsi' index='0' model='lsilogic'/>
<controller type='ide' index='0'/>
<interface type='user'>
<mac address='00:50:56:2f:d3:46'/>
<model type='e1000'/>
</interface>
<video>
conf: also mark the implicit video as primary Commit 119cd06 started setting the primary bool for the first user-specified video even if user omitted the 'primary' attribute. However this was done before the addition of the implicit device. This broke startup of transient qemu domains with no <video>: https://bugzilla.redhat.com/show_bug.cgi?id=1325757 Move this default to virDomainDefPostParseInternal, after the addition of the implicit video device, to catch the implicit video as well.
2016-04-11 12:26:06 +00:00
<model type='vmvga' vram='4096' primary='yes'/>
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
2012-02-23 09:34:45 +00:00
</video>
</devices>
</domain>
Reference in New Issue Copy Permalink