NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

controller: don't set default controller index

Browse Source 
Libvirt is able to figure this out and it will make usage of the CLI
options more user-friendly.

For example if users wants to add a new pcie-root-port to existing VM
they have to figure out the latest controller index and call it like
this:

    virt-xml \
        --add-device \
        --controller pci,model=pcie-root-port,index=$nextIndex \
        $VM

After this change it will be simply:

    virt-xml \
        --add-device \
        --controller pci,model=pcie-root-port \
        $VM

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Pavel Hrdina 2019-12-03 12:35:25 +01:00
parent 29f9f5f2d7
commit 39366c37f6
88 changed files with 328 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
View File

@ -36,14 +36,14 @@
<source file="/tmp/testfile"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
View File

@ -34,14 +34,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -28,8 +28,8 @@
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<controller type="scsi" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -69,8 +69,8 @@
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<controller type="scsi" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml
View File

@ -13,7 +13,7 @@
<on_reboot>destroy</on_reboot>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -40,7 +40,7 @@
<clock offset="utc"/>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
View File

@ -26,10 +26,10 @@
<source file="/var/lib/libvirt/images/disk.qcow2"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi">
<controller type="scsi" model="virtio-scsi">
<address type="pci"/>
</controller>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
View File

@ -23,7 +23,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
View File

@ -19,7 +19,7 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="none"/>
<controller type="usb" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>

8
tests/cli-test-xml/compare/virt-install-boot-uefi.xml
View File

@ -27,14 +27,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
View File

@ -43,14 +43,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -119,14 +119,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-cdrom-double.xml
View File

@ -34,14 +34,14 @@
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -84,14 +84,14 @@
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

16
tests/cli-test-xml/compare/virt-install-cdrom-url.xml
View File

@ -26,14 +26,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -67,14 +67,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

8
tests/cli-test-xml/compare/virt-install-cloud-init-default.xml
View File

@ -32,14 +32,14 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

8
tests/cli-test-xml/compare/virt-install-cloud-init-options.xml
View File

@ -32,14 +32,14 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

16
tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
View File

@ -27,14 +27,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -73,14 +73,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
View File

@ -29,14 +29,14 @@
</pm>
<devices>
<emulator>/usr/libexec/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -77,14 +77,14 @@
</pm>
<devices>
<emulator>/usr/libexec/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
View File

@ -19,14 +19,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -56,14 +56,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

2
tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
View File

@ -35,7 +35,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="network">
<source network="default"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-fake-ftp.xml
View File

@ -26,14 +26,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -68,14 +68,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

16
tests/cli-test-xml/compare/virt-install-fake-http.xml
View File

@ -26,14 +26,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -68,14 +68,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

4
tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
View File

@ -37,7 +37,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -104,7 +104,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
View File

@ -39,7 +39,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -107,7 +107,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
View File

@ -38,7 +38,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -95,7 +95,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
View File

@ -48,14 +48,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -128,14 +128,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
View File

@ -28,14 +28,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -87,14 +87,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
View File

@ -37,14 +37,14 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -104,14 +104,14 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
View File

@ -38,14 +38,14 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -110,14 +110,14 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
View File

@ -38,7 +38,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -104,7 +104,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
View File

@ -43,7 +43,7 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
@ -113,7 +113,7 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>

4
tests/cli-test-xml/compare/virt-install-kvm-win10.xml
View File

@ -49,7 +49,7 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -120,7 +120,7 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -49,7 +49,7 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0"/>
<controller type="usb"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -120,7 +120,7 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0"/>
<controller type="usb"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-location-iso.xml
View File

@ -43,14 +43,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<console type="pty"/>
@ -118,14 +118,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<console type="pty"/>

16
tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
View File

@ -33,14 +33,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -95,14 +95,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-many-devices.xml
View File

@ -232,10 +232,10 @@
<master startport="4"/>
<address type="pci" domain="0" bus="0" slot="4" function="2"/>
</controller>
<controller type="scsi" index="0" model="virtio-scsi">
<controller type="scsi" model="virtio-scsi">
<driver queues="4" iothread="2"/>
</controller>
<controller type="xenbus" index="0" maxGrantFrames="64"/>
<controller type="xenbus" maxGrantFrames="64"/>
<filesystem type="mount" accessmode="mapped">
<driver ats="on" iommu="off"/>
<alias name="testfsalias"/>

16
tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
View File

@ -23,14 +23,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -87,14 +87,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

16
tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
View File

@ -20,14 +20,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -58,14 +58,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

4
tests/cli-test-xml/compare/virt-install-network-install-resources.xml
View File

@ -32,7 +32,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -80,7 +80,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

8
tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
View File

@ -35,14 +35,14 @@
<source file="/var/lib/libvirt/images/disk.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-osinfo-multiple-short-id.xml
View File

@ -36,7 +36,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -89,7 +89,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
View File

@ -38,7 +38,7 @@
<target dev="sda" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -90,7 +90,7 @@
<target dev="sda" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
View File

@ -32,7 +32,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -80,7 +80,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-osinfo-url-with-disk.xml
View File

@ -42,7 +42,7 @@
<source file="/var/lib/libvirt/images/disk.qcow2"/>
<target dev="vdb" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -100,7 +100,7 @@
<source file="/var/lib/libvirt/images/disk.qcow2"/>
<target dev="vdb" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-osinfo-url.xml
View File

@ -32,7 +32,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -80,7 +80,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
View File

@ -48,14 +48,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -121,14 +121,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

16
tests/cli-test-xml/compare/virt-install-osvariant-defaults-pxe.xml
View File

@ -30,14 +30,14 @@
<source file="/var/lib/libvirt/images/fedora26.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -90,14 +90,14 @@
<source file="/var/lib/libvirt/images/fedora26.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

2
tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>

4
tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
View File

@ -25,8 +25,8 @@
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<controller type="scsi" model="virtio-scsi"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>

2
tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-q35-defaults.xml
View File

@ -38,14 +38,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -105,14 +105,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

2
tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
View File

@ -30,7 +30,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

8
tests/cli-test-xml/compare/virt-install-qemu-plain.xml
View File

@ -32,14 +32,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

2
tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
View File

@ -28,7 +28,7 @@
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="scsi" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
View File

@ -28,7 +28,7 @@
<target dev="sda" bus="scsi"/>
<readonly/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="scsi" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

16
tests/cli-test-xml/compare/virt-install-simple-pxe.xml
View File

@ -19,14 +19,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">
@ -56,14 +56,14 @@
</pm>
<devices>
<emulator>/usr/bin/test-hv</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="user">

8
tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
View File

@ -61,14 +61,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<input type="tablet" bus="usb"/>

8
tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
View File

@ -173,8 +173,8 @@
</pm>
<devices>
<emulator>/new/emu</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<controller type="scsi" model="virtio-scsi"/>
<filesystem type="mount" accessmode="mapped">
<source dir="/foo/source"/>
<target dir="/bar/target"/>
@ -414,8 +414,8 @@
</pm>
<devices>
<emulator>/new/emu</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="scsi" index="0" model="virtio-scsi"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<controller type="scsi" model="virtio-scsi"/>
<filesystem type="mount" accessmode="mapped">
<source dir="/foo/source"/>
<target dir="/bar/target"/>

2
tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
View File

@ -90,7 +90,7 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

4
tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
View File

@ -42,7 +42,7 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="none"/>
<controller type="usb" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
@ -92,7 +92,7 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="none"/>
<controller type="usb" model="none"/>
<interface type="user">
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>

16
tests/cli-test-xml/compare/virt-install-win7-uefi.xml
View File

@ -45,14 +45,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">
@ -121,14 +121,14 @@
<target dev="sdb" bus="sata"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

2
tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
View File

@ -34,7 +34,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

2
tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
View File

@ -34,7 +34,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="usb" index="0" model="qemu-xhci" ports="15"/>
<controller type="usb" model="qemu-xhci" ports="15"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

8
tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
View File

@ -26,14 +26,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
View File

@ -26,14 +26,14 @@
</pm>
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

4
tests/cli-test-xml/compare/virt-install-xen-pv.xml
View File

@ -21,7 +21,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<controller type="xenbus" index="0" maxGrantFrames="64"/>
<controller type="xenbus" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>
@ -52,7 +52,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
<controller type="xenbus" index="0" maxGrantFrames="64"/>
<controller type="xenbus" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="testsuitebr0"/>
<mac address="00:11:22:33:44:55"/>

8
tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
View File

@ -30,14 +30,14 @@
<source file="/var/lib/libvirt/images/CentOS-6.4-i386-Gnome-disk1"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
View File

@ -36,14 +36,14 @@
<source file="/var/lib/libvirt/images/testfile"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
View File

@ -36,14 +36,14 @@
<source file="/var/lib/libvirt/images/testfile.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
View File

@ -31,14 +31,14 @@
<source file="/var/lib/libvirt/images/w2k3_32bit-disk1"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt
View File

@ -30,14 +30,14 @@
<source file="/var/lib/libvirt/images/test_gzip.ovf-disk1.vmdk"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw
View File

@ -30,14 +30,14 @@
<source file="/var/lib/libvirt/images/test_gzip.ovf-disk1.vmdk.raw"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
View File

@ -29,14 +29,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -35,14 +35,14 @@
<target dev="hdb" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
View File

@ -34,14 +34,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
View File

@ -34,14 +34,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
View File

@ -34,14 +34,14 @@
<target dev="hda" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="bridge">

8
tests/xmlparse-xml/replace-child-build.xml
View File

@ -39,14 +39,14 @@
<target dev="sdf" bus="scsi"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<console type="pty"/>

8
tests/xmlparse-xml/replace-child-parse.xml
View File

@ -38,14 +38,14 @@
<target dev="sdf" bus="scsi"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<controller type="usb" model="ich9-ehci1"/>
<controller type="usb" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<controller type="usb" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<controller type="usb" model="ich9-uhci3">
<master startport="4"/>
</controller>
<console type="pty"/>

9
virtinst/devices/controller.py
View File

@ -77,12 +77,3 @@ class DeviceController(Device):
driver_queues = XMLProperty("./driver/@queues", is_int=True)
master_startport = XMLProperty("./master/@startport", is_int=True)
##################
# Default config #
##################
def set_defaults(self, _guest):
if self.index is None:
self.index = 0