External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
e2a7dd3f7e
libvirt/tests/qemuxmlconfdata/machine-aliases2.xml

26 lines
782 B
XML
Raw Normal View History

Take domain type into account when looking up default machine If one has e.g. <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc-0.11</machine> <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/kvm</emulator> <machine>pc</machine> <machine>isapc</machine> </domain> </arch> </guest> and start a guest with: <domain type='kvm'> ... <os> <type arch='x86_64'>hvm</type> ... </os> </domain> then the default machine type should be 'pc' and not 'pc-0.11' Issue was reported by Anton Protopopov. * src/capabilities.[ch]: pass the domain type to virCapabilitiesDefaultGuestArch() and use it to look up the default machine type from a specific guest domain if needed. * src/conf/domain_conf.c, src/xen/xm_internal.c: update * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml: update the domain type to 'kvm' and remove the machine type to check that the default gets looked up correctly
2009-10-12 09:52:13 +00:00
<domain type='kvm'>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
<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>
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>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
<os>
Take domain type into account when looking up default machine If one has e.g. <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc-0.11</machine> <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/kvm</emulator> <machine>pc</machine> <machine>isapc</machine> </domain> </arch> </guest> and start a guest with: <domain type='kvm'> ... <os> <type arch='x86_64'>hvm</type> ... </os> </domain> then the default machine type should be 'pc' and not 'pc-0.11' Issue was reported by Anton Protopopov. * src/capabilities.[ch]: pass the domain type to virCapabilitiesDefaultGuestArch() and use it to look up the default machine type from a specific guest domain if needed. * src/conf/domain_conf.c, src/xen/xm_internal.c: update * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml: update the domain type to 'kvm' and remove the machine type to check that the default gets looked up correctly
2009-10-12 09:52:13 +00:00
<type arch='x86_64'>hvm</type>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
tests: unify qemu binary paths for all qemu related tests Our test data used a lot of different qemu binary paths and some of them were based on downstream systems. Note that there is one file where I had to add "accel=kvm" because the qemuargv2xml code parses "/usr/bin/kvm" as virt type="kvm". Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2017-04-06 16:19:48 +00:00
<emulator>/usr/bin/qemu-system-x86_64</emulator>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
<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'/>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
</disk>
Auto-add disk controllers based on defined disks Existing applications using libvirt are not aware of the disk controller concept. Thus, after parsing the <disk> definitions in the XML, it is neccessary to create <controller> elements to satisfy all requested disks, as per their defined drive addresses * src/conf/domain_conf.c, src/conf/domain_conf.h, src/libvirt_private.syms: Add virDomainDefAddDiskControllers() method for populating disk controllers, and call it after parsing disk definitions. * src/qemu/qemu_conf.c: Call virDomainDefAddDiskControllers() when doing ARGV -> XML conversion * tests/qemuxml2argvdata/qemuxml2argv*.xml: Add disk controller data to all data files which don't have it already
2010-01-05 13:31:20 +00:00
<controller type='ide' index='0'/>
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'/>
Test that domain-specific qemu machine types are used correctly * tests/testutilsqemu.c: add a machine types list for /usr/bin/kvm which doesn't have any aliases, while the guest has aliases * tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.*, tests/qemuxml2argvtest.c: add a test using /usr/bin/kvm and make sure that 'pc' machine type doesn't get canonicalized using the aliases in the guest machine type list
2009-09-10 10:22:32 +00:00
</devices>
</domain>
Reference in New Issue Copy Permalink