External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-09 15:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
e9a85a6e4f
libvirt/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml

40 lines
1.3 KiB
XML
Raw Normal View History

tests: qemuargv2xml: separate from qemuxml2argv data Most of the qemuargv2xml tests are parsing old style qemu command lines (with -disk, -serial, etc), and it gets its input from qemuxml2argv output. But since we've raise the minimum supported qemu version to 0.12.0, which supports -device, once that changes propagates through libvirt the vast majority of qemuxml2argv output is _not_ going to be using old style qemu options. In preparation for this, switch qemuargv2xml to use its own copies of input and output, so it's not tied to qemuxml2argv results. This is just a straight copy of the current tests.
2016-01-13 16:02:03 +00:00
<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='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'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
<source file='/tmp/usbdisk.img'/>
<target dev='sda' bus='usb'/>
</disk>
qemu: address: Remove QEMU_CAPS_DEVICE usage All qemu versions we support have QEMU_CAPS_DEVICE, so checking for it is redundant. Remove the usage. The code diff isn't clear, but all that code is just inindented with no other change. Test cases that hit qemuDomainAssignAddresses but don't have infrastructure for specifying qemuCaps values see lots of churn, since now PCI addresses are in the XML output.
2016-05-14 20:36:16 +00:00
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
tests: qemuargv2xml: separate from qemuxml2argv data Most of the qemuargv2xml tests are parsing old style qemu command lines (with -disk, -serial, etc), and it gets its input from qemuxml2argv output. But since we've raise the minimum supported qemu version to 0.12.0, which supports -device, once that changes propagates through libvirt the vast majority of qemuxml2argv output is _not_ going to be using old style qemu options. In preparation for this, switch qemuargv2xml to use its own copies of input and output, so it's not tied to qemuxml2argv results. This is just a straight copy of the current tests.
2016-01-13 16:02:03 +00:00
<controller type='pci' index='0' model='pci-root'/>
qemu: address: Remove QEMU_CAPS_DEVICE usage All qemu versions we support have QEMU_CAPS_DEVICE, so checking for it is redundant. Remove the usage. The code diff isn't clear, but all that code is just inindented with no other change. Test cases that hit qemuDomainAssignAddresses but don't have infrastructure for specifying qemuCaps values see lots of churn, since now PCI addresses are in the XML output.
2016-05-14 20:36:16 +00:00
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
tests: qemuargv2xml: separate from qemuxml2argv data Most of the qemuargv2xml tests are parsing old style qemu command lines (with -disk, -serial, etc), and it gets its input from qemuxml2argv output. But since we've raise the minimum supported qemu version to 0.12.0, which supports -device, once that changes propagates through libvirt the vast majority of qemuxml2argv output is _not_ going to be using old style qemu options. In preparation for this, switch qemuargv2xml to use its own copies of input and output, so it's not tied to qemuxml2argv results. This is just a straight copy of the current tests.
2016-01-13 16:02:03 +00:00
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
</devices>
</domain>
Reference in New Issue Copy Permalink