]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: use qemuDomainMachineIsPSeries
authorPavel Hrdina <phrdina@redhat.com>
Thu, 13 Apr 2017 14:24:45 +0000 (16:24 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 18 Apr 2017 11:27:11 +0000 (13:27 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_capabilities.c

index 6d6bbf246729714415611ab7443efbf8228991cf..0c85a58ebbf37b5b11f45afeedb083ecc77377f2 100644 (file)
@@ -5544,8 +5544,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps,
                              VIR_DOMAIN_DISK_DEVICE_LUN);
 
     /* PowerPC pseries based VMs do not support floppy device */
-    if (!ARCH_IS_PPC64(qemuCaps->arch) ||
-        (STRNEQ(machine, "pseries") && !STRPREFIX(machine, "pseries-")))
+    if (!qemuDomainMachineIsPSeries(machine, qemuCaps->arch))
         VIR_DOMAIN_CAPS_ENUM_SET(disk->diskDevice, VIR_DOMAIN_DISK_DEVICE_FLOPPY);
 
     VIR_DOMAIN_CAPS_ENUM_SET(disk->bus,
@@ -5555,8 +5554,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps,
                              /* VIR_DOMAIN_DISK_BUS_SD */);
 
     /* PowerPC pseries based VMs do not support floppy device */
-    if (!ARCH_IS_PPC64(qemuCaps->arch) ||
-        (STRNEQ(machine, "pseries") && !STRPREFIX(machine, "pseries-")))
+    if (!qemuDomainMachineIsPSeries(machine, qemuCaps->arch))
         VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_FDC);
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE))