From 8a8e3de0e062640f84e61a0f9d9251dc63217125 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 13 Apr 2017 16:24:45 +0200 Subject: [PATCH] qemu: use qemuDomainMachineIsPSeries Signed-off-by: Pavel Hrdina --- src/qemu/qemu_capabilities.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6d6bbf2467..0c85a58ebb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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)) -- 2.47.2