提交 8ddd4480 编写于 作者: P Pavel Hrdina

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

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441964Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
上级 8a8e3de0
...@@ -5547,8 +5547,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, ...@@ -5547,8 +5547,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps,
if (!qemuDomainMachineIsPSeries(machine, qemuCaps->arch)) if (!qemuDomainMachineIsPSeries(machine, qemuCaps->arch))
VIR_DOMAIN_CAPS_ENUM_SET(disk->diskDevice, VIR_DOMAIN_DISK_DEVICE_FLOPPY); 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_CAPS_ENUM_SET(disk->bus,
VIR_DOMAIN_DISK_BUS_IDE,
VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_SCSI,
VIR_DOMAIN_DISK_BUS_VIRTIO, VIR_DOMAIN_DISK_BUS_VIRTIO,
/* VIR_DOMAIN_DISK_BUS_SD */); /* VIR_DOMAIN_DISK_BUS_SD */);
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>fdc</value> <value>fdc</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>fdc</value> <value>fdc</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>fdc</value> <value>fdc</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
<value>usb</value> <value>usb</value>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>fdc</value> <value>fdc</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
......
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
<value>lun</value> <value>lun</value>
</enum> </enum>
<enum name='bus'> <enum name='bus'>
<value>ide</value>
<value>fdc</value> <value>fdc</value>
<value>scsi</value> <value>scsi</value>
<value>virtio</value> <value>virtio</value>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册