External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
512f673835
libvirt/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml

54 lines
1.9 KiB
XML
Raw Normal View History

Fix test breakage from virtio serial changes The virtio serial changes broke the test suite because they forgot to add the new address attribute to the domain XML schema. The xml2xml test also broke because the XML no longer roundtrips. This is due to testing of auto-addition of <controller> elements. Split that test case off into a separate XML file to avoid breakage * docs/schemas/domain.rng: Allow port number for virtio serial addresses * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml: Revert to a simple config to avoid breaking xml2xml test * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args: Add complex test case for auto-controller addition for xml2argv test * tests/qemuxml2argvtest.c: Add channel-virtio-auto test
2010-06-08 15:31:50 +00:00
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</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'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
qemu: Support numad numad is an user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource alignment of applications/virtual machines to improve performance and minimize cost of remote memory latencies. It provides a pre-placement advisory interface, so significant processes can be pre-bound to nodes with sufficient available resources. More details: http://fedoraproject.org/wiki/Features/numad "numad -w ncpus:memory_amount" is the advisory interface numad provides currently. This patch add the support by introducing a new XML attribute for <vcpu>. e.g. <vcpu placement="auto">4</vcpu> <vcpu placement="static" cpuset="1-10^6">4</vcpu> The returned advisory nodeset from numad will be printed in domain's dumped XML. e.g. <vcpu placement="auto" cpuset="1-10^6">4</vcpu> If placement is "auto", the number of vcpus and the current memory amount specified in domain XML will be used for numad command line (numad uses MB for memory amount): numad -w $num_of_vcpus:$current_memory_amount / 1024 The advisory nodeset returned from numad will be used to set domain process CPU affinity then. (e.g. qemuProcessInitCpuAffinity). If the user specifies both CPU affinity policy (e.g. (<vcpu cpuset="1-10,^7,^8">4</vcpu>) and placement == "auto" the specified CPU affinity will be overridden. Only QEMU/KVM drivers support it now. See docs update in patch for more details.
2012-03-08 13:36:26 +00:00
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
Fix test breakage from virtio serial changes The virtio serial changes broke the test suite because they forgot to add the new address attribute to the domain XML schema. The xml2xml test also broke because the XML no longer roundtrips. This is due to testing of auto-addition of <controller> elements. Split that test case off into a separate XML file to avoid breakage * docs/schemas/domain.rng: Allow port number for virtio serial addresses * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml: Revert to a simple config to avoid breaking xml2xml test * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args: Add complex test case for auto-controller addition for xml2argv test * tests/qemuxml2argvtest.c: Add channel-virtio-auto test
2010-06-08 15:31:50 +00:00
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' 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='0' target='0' unit='0'/>
Fix test breakage from virtio serial changes The virtio serial changes broke the test suite because they forgot to add the new address attribute to the domain XML schema. The xml2xml test also broke because the XML no longer roundtrips. This is due to testing of auto-addition of <controller> elements. Split that test case off into a separate XML file to avoid breakage * docs/schemas/domain.rng: Allow port number for virtio serial addresses * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml: Revert to a simple config to avoid breaking xml2xml test * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args: Add complex test case for auto-controller addition for xml2argv test * tests/qemuxml2argvtest.c: Add channel-virtio-auto test
2010-06-08 15:31:50 +00:00
</disk>
domain: add implicit USB controller Some tools, such as virt-manager, prefers having the default USB controller explicit in the XML document. This patch makes sure there is one. With this patch, it is now possible to switch from USB1 to USB2 from the release 0.9.1 of virt-manager. Fix tests to pass with this change.
2012-02-08 00:48:25 +00:00
<controller type='usb' index='0'/>
Fix test breakage from virtio serial changes The virtio serial changes broke the test suite because they forgot to add the new address attribute to the domain XML schema. The xml2xml test also broke because the XML no longer roundtrips. This is due to testing of auto-addition of <controller> elements. Split that test case off into a separate XML file to avoid breakage * docs/schemas/domain.rng: Allow port number for virtio serial addresses * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml: Revert to a simple config to avoid breaking xml2xml test * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args: Add complex test case for auto-controller addition for xml2argv test * tests/qemuxml2argvtest.c: Add channel-virtio-auto test
2010-06-08 15:31:50 +00:00
<controller type='ide' index='0'/>
<controller type='virtio-serial' index='0' ports='16' vectors='4'/>
<controller type='virtio-serial' index='1'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
</controller>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.0'/>
</channel>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.foo'/>
<address type='virtio-serial' controller='1' bus='0'/>
</channel>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.bar'/>
<address type='virtio-serial' controller='1' bus='0' port='3'/>
</channel>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.wizz'/>
<address type='virtio-serial' controller='0' bus='0'/>
</channel>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.ooh'/>
<address type='virtio-serial' controller='1' bus='0'/>
</channel>
<channel type='pty'>
<target type='virtio' name='org.linux-kvm.port.lla'/>
<address type='virtio-serial' controller='2' bus='0'/>
</channel>
Explicitly represent balloon device in XML and handle PCI address To allow compatibility with older QEMU PCI device slot assignment it is necessary to explicitly track the balloon device in the XML. This introduces a new device <memballoon model='virtio|xen'/> It can also have a PCI address, auto-assigned if necessary. The memballoon will be automatically added to all Xen and QEMU guests by default. * docs/schemas/domain.rng: Add <memballoon> element * src/conf/domain_conf.c, src/conf/domain_conf.h: parsing and formatting for memballoon device. Always add a memory balloon device to Xen/QEMU if none exists in XML * src/libvirt_private.syms: Export memballoon model APIs * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Honour the PCI device address in memory balloon device * tests/*: Update to test new functionality
2010-07-15 13:02:42 +00:00
<memballoon model='virtio'/>
Fix test breakage from virtio serial changes The virtio serial changes broke the test suite because they forgot to add the new address attribute to the domain XML schema. The xml2xml test also broke because the XML no longer roundtrips. This is due to testing of auto-addition of <controller> elements. Split that test case off into a separate XML file to avoid breakage * docs/schemas/domain.rng: Allow port number for virtio serial addresses * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml: Revert to a simple config to avoid breaking xml2xml test * tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml, tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args: Add complex test case for auto-controller addition for xml2argv test * tests/qemuxml2argvtest.c: Add channel-virtio-auto test
2010-06-08 15:31:50 +00:00
</devices>
</domain>
Reference in New Issue Copy Permalink