mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
3b8feb4793
The previous approac of just purging the alias combined with the fact that we filled in fake machine types in the test data meant that if a test case used an alias machine type such as 'pc' or 'q35' it would not properly resolve to the actual data returned by qemu. This started to be a problem since the CPU driver now looks at the default CPU reported with the machine type. This patch replaces the original approach of just removing the alias by replacing it with a copy of the machine type data which the type would alias to. This means that we are using the real data while we don't modify the test output after every qemu upgrade. Additionally this change will allow us to drop adding the fake machine types later. The test fallout is from actually excercising the CPU driver with actual data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
84 lines
3.6 KiB
XML
84 lines
3.6 KiB
XML
<domain type='qemu'>
|
|
<name>QEMUGuest1</name>
|
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>219136</memory>
|
|
<currentMemory unit='KiB'>219136</currentMemory>
|
|
<vcpu placement='static'>1</vcpu>
|
|
<os>
|
|
<type arch='x86_64' machine='q35'>hvm</type>
|
|
<boot dev='hd'/>
|
|
</os>
|
|
<cpu mode='custom' match='exact' check='none'>
|
|
<model fallback='forbid'>qemu64</model>
|
|
</cpu>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
|
<disk type='block' device='disk' model='virtio-transitional'>
|
|
<driver name='qemu' type='raw'/>
|
|
<source dev='/dev/HostVG/QEMUGuest1'/>
|
|
<target dev='vda' bus='virtio'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x05' function='0x0'/>
|
|
</disk>
|
|
<controller type='virtio-serial' index='0' model='virtio-transitional'>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x03' function='0x0'/>
|
|
</controller>
|
|
<controller type='scsi' index='0' model='virtio-transitional'>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x04' function='0x0'/>
|
|
</controller>
|
|
<controller type='usb' index='0' model='none'/>
|
|
<controller type='sata' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
|
</controller>
|
|
<controller type='pci' index='0' model='pcie-root'/>
|
|
<controller type='pci' index='1' model='pcie-root-port'>
|
|
<model name='pcie-root-port'/>
|
|
<target chassis='1' port='0x8'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
|
|
</controller>
|
|
<controller type='pci' index='2' model='pcie-to-pci-bridge'>
|
|
<model name='pcie-pci-bridge'/>
|
|
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
|
</controller>
|
|
<controller type='pci' index='3' model='pcie-root-port'>
|
|
<model name='pcie-root-port'/>
|
|
<target chassis='3' port='0x9'/>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
</controller>
|
|
<filesystem type='mount' accessmode='passthrough' model='virtio-transitional'>
|
|
<source dir='/export/fs1'/>
|
|
<target dir='fs1'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
|
|
</filesystem>
|
|
<interface type='user'>
|
|
<mac address='00:11:22:33:44:55'/>
|
|
<model type='virtio-transitional'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x02' function='0x0'/>
|
|
</interface>
|
|
<input type='passthrough' bus='virtio' model='virtio-transitional'>
|
|
<source evdev='/dev/input/event1234'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x09' function='0x0'/>
|
|
</input>
|
|
<input type='mouse' bus='ps2'/>
|
|
<input type='keyboard' bus='ps2'/>
|
|
<hostdev mode='subsystem' type='scsi_host' managed='no' model='virtio-transitional'>
|
|
<source protocol='vhost' wwpn='naa.5123456789abcde0'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x06' function='0x0'/>
|
|
</hostdev>
|
|
<memballoon model='virtio-transitional'>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x07' function='0x0'/>
|
|
</memballoon>
|
|
<rng model='virtio-transitional'>
|
|
<backend model='random'>/dev/urandom</backend>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x08' function='0x0'/>
|
|
</rng>
|
|
<vsock model='virtio-transitional'>
|
|
<cid auto='no' address='4'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x0a' function='0x0'/>
|
|
</vsock>
|
|
</devices>
|
|
</domain>
|