From 4f9fd84f8f620cb1d85314390fa93f9c73dabb88 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 21 Nov 2015 20:07:05 -0500 Subject: [PATCH] diskbackend: Use type=file for empty cdrom, not type=block It doesn't have any operational effect, however since most people use type=file for cdrom isos, this makes it easier for people to hand edit the XML. --- tests/cli-test-xml/compare/virt-convert-vmx-compare.xml | 2 +- tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml | 2 +- .../cli-test-xml/compare/virt-install-kvm-session-defaults.xml | 2 +- tests/cli-test-xml/compare/virt-install-location-iso.xml | 2 +- tests/cli-test-xml/compare/virt-install-many-devices.xml | 2 +- tests/cli-test-xml/compare/virt-install-q35-defaults.xml | 2 +- tests/clone-xml/force-out.xml | 2 +- .../libvirt_output/vmx2libvirt_test-nodisks.libvirt | 2 +- .../libvirt_output/vmx2libvirt_test-vmx-zip.libvirt | 2 +- tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt | 2 +- .../libvirt_output/vmx2libvirt_test1.libvirt.disk_raw | 2 +- tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt | 2 +- tests/xmlconfig-xml/install-f11-norheldefaults.xml | 2 +- tests/xmlconfig-xml/install-f11-rheldefaults.xml | 2 +- tests/xmlparse-xml/change-disk-out.xml | 2 +- virtinst/diskbackend.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml index 202542bad..9ef61fba6 100644 --- a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml +++ b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml @@ -35,7 +35,7 @@ - + diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml index e00d6a774..22b499bd6 100644 --- a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml +++ b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml @@ -60,7 +60,7 @@ - + diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml index aa269fa47..ea95cf078 100644 --- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml +++ b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml @@ -113,7 +113,7 @@ - + diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/cli-test-xml/compare/virt-install-location-iso.xml index b990055ea..d9c38af30 100644 --- a/tests/cli-test-xml/compare/virt-install-location-iso.xml +++ b/tests/cli-test-xml/compare/virt-install-location-iso.xml @@ -95,7 +95,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml index ba6cce521..d9cf910c8 100644 --- a/tests/cli-test-xml/compare/virt-install-many-devices.xml +++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml @@ -43,7 +43,7 @@ - + 1 diff --git a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml index 9c6bce0a9..ebf8b0a4f 100644 --- a/tests/cli-test-xml/compare/virt-install-q35-defaults.xml +++ b/tests/cli-test-xml/compare/virt-install-q35-defaults.xml @@ -109,7 +109,7 @@ - + diff --git a/tests/clone-xml/force-out.xml b/tests/clone-xml/force-out.xml index 63670f851..63bf6102f 100644 --- a/tests/clone-xml/force-out.xml +++ b/tests/clone-xml/force-out.xml @@ -21,7 +21,7 @@ - + diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt index 3e7f07911..2f6b621a9 100644 --- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt +++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt @@ -30,7 +30,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt index a3dcb85bf..b03ca3c2c 100644 --- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt +++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt @@ -31,7 +31,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt index 687e7058c..1357a5fd4 100644 --- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt +++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt @@ -35,7 +35,7 @@ - + diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw index 127080983..c4ca5a6a9 100644 --- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw +++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw @@ -35,7 +35,7 @@ - + diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt index 4692fbf1e..c65a168b3 100644 --- a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt +++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt @@ -31,7 +31,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/xmlconfig-xml/install-f11-norheldefaults.xml b/tests/xmlconfig-xml/install-f11-norheldefaults.xml index 52b1e47f3..889c320d0 100644 --- a/tests/xmlconfig-xml/install-f11-norheldefaults.xml +++ b/tests/xmlconfig-xml/install-f11-norheldefaults.xml @@ -37,7 +37,7 @@ - + diff --git a/tests/xmlconfig-xml/install-f11-rheldefaults.xml b/tests/xmlconfig-xml/install-f11-rheldefaults.xml index 3fa9edb8c..d6c094bd0 100644 --- a/tests/xmlconfig-xml/install-f11-rheldefaults.xml +++ b/tests/xmlconfig-xml/install-f11-rheldefaults.xml @@ -37,7 +37,7 @@ - + diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml index 981b064e5..6fa82c579 100644 --- a/tests/xmlparse-xml/change-disk-out.xml +++ b/tests/xmlparse-xml/change-disk-out.xml @@ -31,7 +31,7 @@ - + diff --git a/virtinst/diskbackend.py b/virtinst/diskbackend.py index 54e059f6d..8cf21ad04 100644 --- a/virtinst/diskbackend.py +++ b/virtinst/diskbackend.py @@ -557,7 +557,7 @@ class StorageBackend(_StorageBase): self._dev_type = "block" if not self._dev_type: - self._dev_type = "block" + self._dev_type = "file" return self._dev_type def get_driver_type(self):