External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
c08b2ac24f
libvirt/tests/qemuxml2argvdata/graphics-spice-timeout.xml

69 lines
2.4 KiB
XML
Raw Normal View History

qemu: Don't compare CPU against host for TCG Right now when building the qemu command line, we try to do various unconditional validations of the guest CPU against the host CPU. However this checks are overly applied. The only time we should use the checks are: - The user requests host-model/host-passthrough, or - When KVM is requsted. CPU features requested in TCG mode are always emulated by qemu and are independent of the host CPU, so no host CPU checks should be performed. Right now if trying to specify a CPU for arm on an x86 host, it attempts to do non-sensical validation and falls over. Switch all the test cases that were intending to test CPU validation to use KVM, so they continue to test the intended code. Amend some aarch64 XML tests with a CPU model, to ensure things work correctly.
2014-09-23 17:07:09 +00:00
<domain type='kvm'>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<name>f14</name>
<uuid>553effab-b5e1-2d80-dfe3-da4344826c43</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'>1048576</memory>
<currentMemory unit='KiB'>1048576</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'>2</vcpu>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<os>
qemuxml2argvdata: Use proper arch and emulator for x86 real capability tests Upcoming patches will modify how we populate the capability cache in tests to be more saner. This also means that the emulator binary and architecture used in the test files using real capabilities must match what the real capabilities have. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-04 15:36:46 +00:00
<type arch='x86_64' machine='pc'>hvm</type>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<boot dev='cdrom'/>
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
<features>
<acpi/>
<apic/>
<pae/>
</features>
tests/qemuxml2*/graphics-spice-timeout: skip CPU model check Commit 65b0b746b516 changed spice tests to use latest caps. Before this change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs(). The absence of this flag triggered the code path inside testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function will update the host CPU via virQEMUCapsUpdateHostCPUModel() into virQEMUCapsInitHostCPUModel(). In this function, virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned commit, the host CPU was being defaulted to x86_64, vendor Intel, for the 'graphics-spice-timeout' test that is using the 'pc' machine type and 'accel=kvm'. Today, "FLAG_REAL_CAPS" is being set because we're using the latest caps from x86_64. This means that the whole code path mentioned above is skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache() directly. Without the handling being done by testUpdateQEMUCaps(), the host CPU is being retrieved later on, down below qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU(). The latter will attempt to update the domain cpu and executing a virCPUCompare with the hostCPU and def->cpu. All this logic ended up causing a failure of the 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is being run with KVM acceleration, and the KVM driver for ppc64 and s390x will return a default x86_64 CPU with vendor "AMD", making virCPUCompare() fail with the following message: "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU Driver error : the CPU is incompatible with host CPU: host CPU vendor does not match required CPU vendor Intel" Fix this test by setting cpu check='none' and avoid the virCPUCompare() that causes the problem for ppc64 and s390x hosts. Note that this is a build fix. A more adequate fix would be to mock the getHost() interface of the cpuDriverX86 for non-x86 hosts, allowing 'fullCPU' to be retrieved in qemuProcessUpdateGuestCPU(), and a proper x86 CPU to be retrieved in the scenario described above. Reported-by: Boris Fiuczynski <fiuczy@linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2021-11-16 17:21:11 +00:00
<cpu match='exact' check='none'>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<model>core2duo</model>
<vendor>Intel</vendor>
conf: add support for specifying CPU "dies" parameter Recently CPU hardware vendors have started to support a new structure inside the CPU package topology known as a "die". Thus the hierarchy is now: sockets > dies > cores > threads This adds support for "dies" in the XML parser, with the value defaulting to 1 if not specified for backwards compatibility. For example a system with 64 logical CPUs might report <topology sockets="4" dies="2" cores="4" threads="2"/> Reviewed-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-12-16 11:16:51 +00:00
<topology sockets='1' dies='1' cores='2' threads='1'/>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<feature policy='require' name='ds'/>
qemuxml2argvtest: Reorder CPU features The x86 CPU driver translated each CPU definition from domain XML into CPUID data and then back to CPU definition. This effectively sorted the list of CPU features according to their CPUID values. Since this is going to change, we need to reorder CPU features in a few test files to make sure the generated QEMU command lines will not change. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
2016-08-05 12:42:15 +00:00
<feature policy='require' name='acpi'/>
<feature policy='require' name='ss'/>
<feature policy='require' name='ht'/>
<feature policy='require' name='tm'/>
<feature policy='require' name='pbe'/>
<feature policy='require' name='ds_cpl'/>
<feature policy='require' name='vmx'/>
<feature policy='require' name='est'/>
<feature policy='require' name='tm2'/>
<feature policy='require' name='cx16'/>
<feature policy='require' name='xtpr'/>
<feature policy='require' name='lahf_lm'/>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
qemuxml2argvdata: Use proper arch and emulator for x86 real capability tests Upcoming patches will modify how we populate the capability cache in tests to be more saner. This also means that the emulator binary and architecture used in the test files using real capabilities must match what the real capabilities have. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-04 15:36:46 +00:00
<emulator>/usr/bin/qemu-system-x86_64</emulator>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</controller>
<interface type='ethernet'>
<mac address='52:54:00:71:70:89'/>
<script path='/etc/qemu-ifup'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</interface>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
conf: Add keyboard input device type There is no keyboard support currently in libvirt. For some platforms (PPC64 QEMU) this makes graphics unusable, since the keyboard is not implicit and it can't be added via libvirt. Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2014-02-17 10:17:53 +00:00
<input type='keyboard' bus='ps2'/>
graphics: add support for action_if_connected in qemu This option accepts 3 values: -keep, to keep current client connected (Spice+VNC) -disconnect, to disconnect client (Spice) -fail, to fail setting password if there is a client connected (Spice)
2011-05-26 14:15:54 +00:00
<graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<sound model='ac97'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</sound>
<video>
video: cleanup usage of vram attribute and update documentation The vram attribute was introduced to set the video memory but it is usable only for few hypervisors excluding QEMU/KVM and the old XEN driver. Only in case of QEMU the vram was used for QXL. This patch updates the documentation to reflect current code in libvirt and also changes the cases when we will set the default vram attribute. It also fixes existing strange default value for VGA devices 9MB to 16MB because the video ram should be rounded to power of two. The change of default value could affect migrations but I found out that QEMU always round the video ram to power of two internally so it's safe to change the default value to the next closest power of two and also silently correct every domain XML definition. And it's also safe because we don't pass the value to QEMU. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1076098 Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
2014-11-24 10:58:53 +00:00
<model type='vga' vram='16384' heads='1'/>
tests: Add more complex domain scheme test data
2011-05-26 11:52:08 +00:00
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
Reference in New Issue Copy Permalink