summaryrefslogtreecommitdiffstats
path: root/src/test/resources
diff options
context:
space:
mode:
authorManuel Bentele2022-02-04 12:19:44 +0100
committerManuel Bentele2022-02-04 12:19:44 +0100
commit255c829b598a7a3151489e7121c56b219e530777 (patch)
tree2bd704054b6b3663b3bd9abbcc4604dace7da176 /src/test/resources
parentFix resource path for virtualizer config tests on Windows platforms (diff)
downloadmaster-sync-shared-255c829b598a7a3151489e7121c56b219e530777.tar.gz
master-sync-shared-255c829b598a7a3151489e7121c56b219e530777.tar.xz
master-sync-shared-255c829b598a7a3151489e7121c56b219e530777.zip
Force Unix line endings for Libvirt XML files (even on Windows platforms)
Diffstat (limited to 'src/test/resources')
-rw-r--r--src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml8
-rw-r--r--src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox10
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
index bf4de75..ed2210b 100644
--- a/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
+++ b/src/test/resources/libvirt/xml/qemu-kvm_default-ubuntu-20-04-vm_transform-editable.xml
@@ -54,18 +54,18 @@
<address bus="0" controller="0" target="0" type="drive" unit="0"/>
<readonly/>
</disk>
- <controller index="0" model="ich9-uhci1" type="usb">
+ <controller index="0" model="ich9-ehci1" type="usb">
<address bus="0x00" domain="0x0000" function="0x7" slot="0x1d" type="pci"/>
</controller>
- <controller index="0" model="ich9-uhci2" type="usb">
+ <controller index="0" model="ich9-uhci1" type="usb">
<master startport="0"/>
<address bus="0x00" domain="0x0000" function="0x0" multifunction="on" slot="0x1d" type="pci"/>
</controller>
- <controller index="0" model="ich9-uhci3" type="usb">
+ <controller index="0" model="ich9-uhci2" type="usb">
<master startport="2"/>
<address bus="0x00" domain="0x0000" function="0x1" slot="0x1d" type="pci"/>
</controller>
- <controller index="0" model="ich9-ehci1" type="usb">
+ <controller index="0" model="ich9-uhci3" type="usb">
<master startport="4"/>
<address bus="0x00" domain="0x0000" function="0x2" slot="0x1d" type="pci"/>
</controller>
diff --git a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
index 9bfffcd..9c89f4b 100644
--- a/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
+++ b/src/test/resources/virtualbox/xml/virtualbox_default-ubuntu_transform-editable.vbox
@@ -18,6 +18,11 @@
<IOAPIC enabled="true"/>
<SmbiosUuidLittleEndian enabled="true"/>
</BIOS>
+ <USB>
+ <Controllers>
+ <Controller name="OHCI" type="OHCI"/>
+ </Controllers>
+ </USB>
<Network>
<Adapter MACAddress="080027B86D12" enabled="true" slot="0" type="82540EM">
<NAT/>
@@ -26,11 +31,6 @@
<AudioAdapter codec="AD1980" driver="Pulse" enabled="true" enabledIn="false"/>
<RTC localOrUTC="UTC"/>
<Clipboard/>
- <USB>
- <Controllers>
- <Controller name="OHCI" type="OHCI"/>
- </Controllers>
- </USB>
</Hardware>
<StorageControllers>
<StorageController Bootable="true" PortCount="2" name="IDE" type="PIIX4" useHostIOCache="true"/>