shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-27 07:22:07 +03:00
Code Releases Activity
d65acbde35
libvirt/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml

42 lines
1.4 KiB
XML
Raw Normal View History

test: USB controller can have a PCI address child element add a few tests for the new constructs
2011-09-02 17:26:55 +04: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 04:48:38 +04:00
<memory unit='KiB'>219136</memory>
xml: drop unenforced minimum memory limit from RNG The test domain allows <memory>0</memory>, but the RNG was stating that memory had to be at least 4096000 bytes. Hypervisors should enforce their own limits, rather than complicating the RNG. Meanwhile, some copy and paste had introduced some fishy constructs in various unit tests. * docs/schemas/domaincommon.rng (memoryKB, memoryKBElement): Drop limit that isn't enforced in code. * src/conf/domain_conf.c (virDomainDefParseXML): Require current <= maximum. * tests/qemuxml2argvdata/*.xml: Fix offenders.
2012-02-23 08:18:39 +04:00
<currentMemory unit='KiB'>219136</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 20:04:36 +04:00
<vcpu placement='static'>1</vcpu>
test: USB controller can have a PCI address child element add a few tests for the new constructs
2011-09-02 17:26:55 +04:00
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
<emulator>/usr/bin/qemu</emulator>
Fix logic for assigning PCI addresses to USB2 companion controllers Currently each USB2 companion controller gets put on a separate PCI slot. Not only is this wasteful of PCI slots, but it is not in compliance with the spec for USB2 controllers. The master echi1 and all companion controllers should be in the same slot, with echi1 in function 7, and uhci1-3 in functions 0-2 respectively. * src/qemu/qemu_command.c: Special case handling of USB2 controllers to apply correct pci slot assignment * tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args, tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml: Expand test to cover automatic slot assignment
2012-05-14 14:16:22 +04:00
<!-- Intentionally mixed up ordering to check we assign
addresses to the correct matching companions -->
test: USB controller can have a PCI address child element add a few tests for the new constructs
2011-09-02 17:26:55 +04:00
<controller type='usb' index='0' model='ich9-ehci1'>
Fix logic for assigning PCI addresses to USB2 companion controllers Currently each USB2 companion controller gets put on a separate PCI slot. Not only is this wasteful of PCI slots, but it is not in compliance with the spec for USB2 controllers. The master echi1 and all companion controllers should be in the same slot, with echi1 in function 7, and uhci1-3 in functions 0-2 respectively. * src/qemu/qemu_command.c: Special case handling of USB2 controllers to apply correct pci slot assignment * tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args, tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml: Expand test to cover automatic slot assignment
2012-05-14 14:16:22 +04:00
</controller>
<controller type='usb' index='2' model='ich9-ehci1'>
</controller>
<controller type='usb' index='1' model='ich9-ehci1'>
</controller>
Set a sensible default master start port for ehci companion controllers The uhci1, uhci2, uhci3 companion controllers for ehci1 must have a master start port set. Since this value is predictable we should set it automatically if the app does not supply it
2012-05-14 16:22:58 +04:00
<controller type='usb' index='0' model='ich9-uhci1'/>
<controller type='usb' index='1' model='ich9-uhci1'/>
Fix logic for assigning PCI addresses to USB2 companion controllers Currently each USB2 companion controller gets put on a separate PCI slot. Not only is this wasteful of PCI slots, but it is not in compliance with the spec for USB2 controllers. The master echi1 and all companion controllers should be in the same slot, with echi1 in function 7, and uhci1-3 in functions 0-2 respectively. * src/qemu/qemu_command.c: Special case handling of USB2 controllers to apply correct pci slot assignment * tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args, tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml: Expand test to cover automatic slot assignment
2012-05-14 14:16:22 +04:00
<controller type='usb' index='2' model='ich9-uhci1'>
<master startport='0'/>
</controller>
Set a sensible default master start port for ehci companion controllers The uhci1, uhci2, uhci3 companion controllers for ehci1 must have a master start port set. Since this value is predictable we should set it automatically if the app does not supply it
2012-05-14 16:22:58 +04:00
<controller type='usb' index='0' model='ich9-uhci3'/>
Fix logic for assigning PCI addresses to USB2 companion controllers Currently each USB2 companion controller gets put on a separate PCI slot. Not only is this wasteful of PCI slots, but it is not in compliance with the spec for USB2 controllers. The master echi1 and all companion controllers should be in the same slot, with echi1 in function 7, and uhci1-3 in functions 0-2 respectively. * src/qemu/qemu_command.c: Special case handling of USB2 controllers to apply correct pci slot assignment * tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args, tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml: Expand test to cover automatic slot assignment
2012-05-14 14:16:22 +04:00
<controller type='usb' index='1' model='ich9-uhci3'>
<master startport='4'/>
</controller>
<controller type='usb' index='2' model='ich9-uhci3'>
<master startport='4'/>
</controller>
Set a sensible default master start port for ehci companion controllers The uhci1, uhci2, uhci3 companion controllers for ehci1 must have a master start port set. Since this value is predictable we should set it automatically if the app does not supply it
2012-05-14 16:22:58 +04:00
<controller type='usb' index='2' model='ich9-uhci2'/>
<controller type='usb' index='1' model='ich9-uhci2'/>
<controller type='usb' index='0' model='ich9-uhci2'/>
test: USB controller can have a PCI address child element add a few tests for the new constructs
2011-09-02 17:26:55 +04:00
<memballoon model='virtio'/>
</devices>
</domain>
Copy Permalink