From c0cb35b06e7a9567972ce3162f01b2b13a70ca80 Mon Sep 17 00:00:00 2001
From: Xu Tian <xutian@redhat.com>
Date: Thu, 1 Dec 2016 10:46:54 +0800
Subject: [PATCH] floppy: disable floppy test for q35 and pseries machine

Signed-off-by: Xu Tian <xutian@redhat.com>
---
 generic/tests/cfg/boot_savevm.cfg             | 2 ++
 generic/tests/cfg/unattended_install.cfg      | 2 ++
 multi_host_migration/tests/cfg/multi_host.cfg | 2 ++
 qemu/tests/cfg/floppy_test.cfg                | 1 +
 qemu/tests/cfg/readonly_floppy.cfg            | 1 +
 5 files changed, 8 insertions(+)

diff --git a/generic/tests/cfg/boot_savevm.cfg b/generic/tests/cfg/boot_savevm.cfg
index 208396f7..0de6b1f9 100644
--- a/generic/tests/cfg/boot_savevm.cfg
+++ b/generic/tests/cfg/boot_savevm.cfg
@@ -14,6 +14,8 @@
         - default_savevm:
 
         - with_floppy:
+            no q35
+            no pseries
             no Host_RHEL.m7
             virt_test_type = qemu
             save_method = save_to_tag
diff --git a/generic/tests/cfg/unattended_install.cfg b/generic/tests/cfg/unattended_install.cfg
index 7649db77..53027f20 100644
--- a/generic/tests/cfg/unattended_install.cfg
+++ b/generic/tests/cfg/unattended_install.cfg
@@ -119,6 +119,8 @@
         # Image with kickstart is attached into the guest as floppy drive
         - floppy_ks:
             unattended_delivery_method = floppy
+            no q35
+            no pseries
         # Only perform a libvirt import. No cdroms, no floppies, no nothing
         - import:
             virt_test_type = libvirt
diff --git a/multi_host_migration/tests/cfg/multi_host.cfg b/multi_host_migration/tests/cfg/multi_host.cfg
index 54b9352c..946bc5fd 100644
--- a/multi_host_migration/tests/cfg/multi_host.cfg
+++ b/multi_host_migration/tests/cfg/multi_host.cfg
@@ -393,6 +393,8 @@
 
                 - floppy_test:
                     type = floppy
+                    no q35
+                    no pseries
                     start_vm = no
                     floppies = "fl"
                     floppy_name = "images/test_floppy.img"
diff --git a/qemu/tests/cfg/floppy_test.cfg b/qemu/tests/cfg/floppy_test.cfg
index 9b422fe7..362e07f7 100644
--- a/qemu/tests/cfg/floppy_test.cfg
+++ b/qemu/tests/cfg/floppy_test.cfg
@@ -1,6 +1,7 @@
 - floppy_test: install setup image_copy unattended_install.cdrom
     type = floppy
     no pseries
+    no q35
     start_vm = no
     floppies = "fl"
     guest_floppy_path = "/dev/fd0"
diff --git a/qemu/tests/cfg/readonly_floppy.cfg b/qemu/tests/cfg/readonly_floppy.cfg
index a168b101..778f44d5 100644
--- a/qemu/tests/cfg/readonly_floppy.cfg
+++ b/qemu/tests/cfg/readonly_floppy.cfg
@@ -2,6 +2,7 @@
     virt_test_type = qemu
     type = readonly_floppy
     no pseries
+    no q35
     floppies = "fl1 fl2"
     floppy_name_fl1 = "images/fd1.img"
     floppy_name_fl2 = "images/fd2.img"
-- 
GitLab