External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: report IDE bus in domain capabilities only if it's supported

Browse Source 
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441964

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-04-13 15:29:16 +02:00
parent 8a8e3de0e0
commit 8ddd44806b
7 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -5547,8 +5547,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps,
if (!qemuDomainMachineIsPSeries(machine, qemuCaps->arch))
VIR_DOMAIN_CAPS_ENUM_SET(disk->diskDevice, VIR_DOMAIN_DISK_DEVICE_FLOPPY);
if (qemuDomainMachineHasBuiltinIDE(machine))
VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_IDE);
VIR_DOMAIN_CAPS_ENUM_SET(disk->bus,
VIR_DOMAIN_DISK_BUS_IDE,
VIR_DOMAIN_DISK_BUS_SCSI,
VIR_DOMAIN_DISK_BUS_VIRTIO,
/* VIR_DOMAIN_DISK_BUS_SD */);

1
tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
View File

@ -63,7 +63,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>fdc</value>
<value>scsi</value>
<value>virtio</value>

1
tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
View File

@ -63,7 +63,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>fdc</value>
<value>scsi</value>
<value>virtio</value>

1
tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
View File

@ -63,7 +63,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>fdc</value>
<value>scsi</value>
<value>virtio</value>

1
tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
View File

@ -37,7 +37,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>scsi</value>
<value>virtio</value>
<value>usb</value>

1
tests/domaincapsschemadata/qemu_2.7.0.s390x.xml
View File

@ -32,7 +32,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>fdc</value>
<value>scsi</value>
<value>virtio</value>

1
tests/domaincapsschemadata/qemu_2.8.0.s390x.xml
View File

@ -113,7 +113,6 @@
<value>lun</value>
</enum>
<enum name='bus'>
<value>ide</value>
<value>fdc</value>
<value>scsi</value>
<value>virtio</value>