| From 09f3f5a0fa779a4a151f1aeba1ec82d935beb248 Mon Sep 17 00:00:00 2001 |
| Message-Id: <09f3f5a0fa779a4a151f1aeba1ec82d935beb248@dist-git> |
| From: Pavel Hrdina <phrdina@redhat.com> |
| Date: Wed, 19 Apr 2017 09:51:15 +0200 |
| Subject: [PATCH] qemu: report IDE bus in domain capabilities only if it's |
| supported |
| |
| Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441964 |
| |
| Signed-off-by: Pavel Hrdina <phrdina@redhat.com> |
| (cherry picked from commit 8ddd44806b62cec11072a5cccd4b1ab0da315425) |
| Signed-off-by: Pavel Hrdina <phrdina@redhat.com> |
| |
| src/qemu/qemu_capabilities.c | 4 +++- |
| tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml | 1 - |
| tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml | 1 - |
| tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 - |
| tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 1 - |
| tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - |
| tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - |
| 7 files changed, 3 insertions(+), 7 deletions(-) |
| |
| diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c |
| index b7c2c3705..950a42bae 100644 |
| |
| |
| @@ -5512,8 +5512,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, |
| (STRNEQ(machine, "pseries") && !STRPREFIX(machine, "pseries-"))) |
| 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 */); |
| diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml |
| index 1fa7f6dff..54b89dc72 100644 |
| |
| |
| @@ -63,7 +63,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>fdc</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml |
| index d60fc1df9..60bf2f54f 100644 |
| |
| |
| @@ -63,7 +63,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>fdc</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml |
| index fcc6f50e0..1a980927c 100644 |
| |
| |
| @@ -63,7 +63,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>fdc</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml |
| index 755c4f447..4ecf8651b 100644 |
| |
| |
| @@ -37,7 +37,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| <value>usb</value> |
| diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml |
| index 999e2795d..dc6d2d8f0 100644 |
| |
| |
| @@ -32,7 +32,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>fdc</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml |
| index 0b8135bc5..53c3190f2 100644 |
| |
| |
| @@ -113,7 +113,6 @@ |
| <value>lun</value> |
| </enum> |
| <enum name='bus'> |
| - <value>ide</value> |
| <value>fdc</value> |
| <value>scsi</value> |
| <value>virtio</value> |
| -- |
| 2.12.2 |
| |