External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-02 19:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4a3976211d
libvirt/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml

53 lines
1.8 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>
Add VIR_DIV_UP to divide memory or storage request sizes with round up Use it in all places where a memory or storage request size is converted to a larger granularity. This avoids requesting too small memory or storage sizes that could result from the truncation done by a simple division. This extends the round up fix in 6002e0406c338668ea0ecbfeb6c1ef20a8b67efe to the whole codebase. Instead of reporting errors for odd values in the VMX code round them up. Update the QEMU Argv tests accordingly as the original memory size 219200 isn't a even multiple of 1024 and is rounded up to 215 megabyte now. Change it to 219100 and 219136. Use two different values intentionally to make sure that rounding up works. Update virsh.pod accordingly, as rounding down and rejecting are replaced by rounding up.
2011-01-28 21:03:24 +00:00
<memory>219100</memory>
<currentMemory>219100</currentMemory>
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
<vcpu cpuset='1-4,8-20,525'>1</vcpu>
<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'/>
<address type='drive' controller='0' bus='0' unit='0'/>
</disk>
<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