From 738db8353055eb6fd902513949c6659af8b401d0 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Wed, 2 Sep 2020 09:39:41 +0200

Subject: Enable make check

Fixing tests after device disabling and machine types changes and enabling

make check run during build.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

Rebase changes (6.1.0):

- removed unnecessary test changes

Rebase changes (6.2.0):

- new way of disabling bios-table-test

Rebase changes (7.0.0):

- Disable testing virtio-iommu-pci

- Rename default_bus_bypass_iommu property to default-bus-bypass-iommu

- Disable qtest-bios-table for aarch64

- Removed redhat chunks for boot-serial-test.c, cdrom-test.c and cpu-plug-test.c qtests

- Do not disable boot-order-test, prom-env-test and boot-serial-test qtests

- Use rhel machine type for new intel hda qtest

- Remove unnecessary changes in iotest 051

- Remove changes in bios-tables-test.c and prom-env-test.c qtests

Rebase changes (7.1.0 rc0):

- Disable bcm2835-dma-test (added upstream)

Rebase changes (8.0.0-rc1):

- Removed chunks for disabling bios-table-test (protected upstream)

Rebase change (8.0.0-rc2):

- Disable new qemu-iotests execution

- Revert change in tco qtest (blocking test run)

Merged patches (6.1.0):

- 2f129df7d3 redhat: Enable the 'test-block-iothread' test again

Merged patches (7.1.0 rc0):

- 64d736640e RHEL-only: tests/avocado: Switch aarch64 tests from a53 to a57

---

 .distro/qemu-kvm.spec.template      |  4 ++--

 tests/avocado/replay_kernel.py      |  2 +-

 tests/avocado/reverse_debugging.py  |  2 +-

 tests/avocado/tcg_plugins.py        |  6 ++---

 tests/qemu-iotests/meson.build      | 34 ++++++++++++++---------------

 tests/qtest/fuzz-e1000e-test.c      |  2 +-

 tests/qtest/fuzz-virtio-scsi-test.c |  2 +-

 tests/qtest/intel-hda-test.c        |  2 +-

 tests/qtest/libqos/meson.build      |  2 +-

 tests/qtest/lpc-ich9-test.c         |  2 +-

 tests/qtest/meson.build             |  2 --

 tests/qtest/tco-test.c              |  2 +-

 tests/qtest/usb-hcd-xhci-test.c     |  4 ++++

 tests/qtest/virtio-net-failover.c   |  1 +

 14 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py

index f13456e1ec..2fee270a42 100644

--- a/tests/avocado/replay_kernel.py

+++ b/tests/avocado/replay_kernel.py

@@ -147,7 +147,7 @@ def test_aarch64_virt(self):

         """

         :avocado: tags=arch:aarch64

         :avocado: tags=machine:virt

-        :avocado: tags=cpu:cortex-a53

+        :avocado: tags=cpu:cortex-a57

         """

         kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'

                       '/linux/releases/29/Everything/aarch64/os/images/pxeboot'

diff --git a/tests/avocado/reverse_debugging.py b/tests/avocado/reverse_debugging.py

index 680c314cfc..71eccb8fb6 100644

--- a/tests/avocado/reverse_debugging.py

+++ b/tests/avocado/reverse_debugging.py

@@ -206,7 +206,7 @@ def test_aarch64_virt(self):

         """

         :avocado: tags=arch:aarch64

         :avocado: tags=machine:virt

-        :avocado: tags=cpu:cortex-a53

+        :avocado: tags=cpu:cortex-a57

         """

         kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'

                       '/linux/releases/29/Everything/aarch64/os/images/pxeboot'

diff --git a/tests/avocado/tcg_plugins.py b/tests/avocado/tcg_plugins.py

index 642d2e49e3..93b3afd823 100644

--- a/tests/avocado/tcg_plugins.py

+++ b/tests/avocado/tcg_plugins.py

@@ -68,7 +68,7 @@ def test_aarch64_virt_insn(self):

         :avocado: tags=accel:tcg

         :avocado: tags=arch:aarch64

         :avocado: tags=machine:virt

-        :avocado: tags=cpu:cortex-a53

+        :avocado: tags=cpu:cortex-a57

         """

         kernel_path = self._grab_aarch64_kernel()

         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

@@ -94,7 +94,7 @@ def test_aarch64_virt_insn_icount(self):

         :avocado: tags=accel:tcg

         :avocado: tags=arch:aarch64

         :avocado: tags=machine:virt

-        :avocado: tags=cpu:cortex-a53

+        :avocado: tags=cpu:cortex-a57

         """

         kernel_path = self._grab_aarch64_kernel()

         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

@@ -120,7 +120,7 @@ def test_aarch64_virt_mem_icount(self):

         :avocado: tags=accel:tcg

         :avocado: tags=arch:aarch64

         :avocado: tags=machine:virt

-        :avocado: tags=cpu:cortex-a53

+        :avocado: tags=cpu:cortex-a57

         """

         kernel_path = self._grab_aarch64_kernel()

         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +

diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build

index 9735071a29..32002335f4 100644

--- a/tests/qemu-iotests/meson.build

+++ b/tests/qemu-iotests/meson.build

@@ -51,21 +51,21 @@ foreach format, speed: qemu_iotests_formats

       check: true,

   )

-  foreach item: rc.stdout().strip().split()

-      args = [qemu_iotests_check_cmd,

-              '-tap', '-' + format, item,

-              '--source-dir', meson.current_source_dir(),

-              '--build-dir', meson.current_build_dir()]

-      # Some individual tests take as long as 45 seconds

-      # Bump the timeout to 3 minutes for some headroom

-      # on slow machines to minimize spurious failures

-      test('io-' + format + '-' + item,

-           python,

-           args: args,

-           depends: qemu_iotests_binaries,

-           env: qemu_iotests_env,

-           protocol: 'tap',

-           timeout: 180,

-           suite: suites)

-  endforeach

+#  foreach item: rc.stdout().strip().split()

+#      args = [qemu_iotests_check_cmd,

+#              '-tap', '-' + format, item,

+#              '--source-dir', meson.current_source_dir(),

+#              '--build-dir', meson.current_build_dir()]

+#      # Some individual tests take as long as 45 seconds

+#      # Bump the timeout to 3 minutes for some headroom

+#      # on slow machines to minimize spurious failures

+#      test('io-' + format + '-' + item,

+#           python,

+#           args: args,

+#           depends: qemu_iotests_binaries,

+#           env: qemu_iotests_env,

+#           protocol: 'tap',

+#           timeout: 180,

+#           suite: suites)

+#  endforeach

 endforeach

diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c

index 5052883fb6..b5286f4b12 100644

--- a/tests/qtest/fuzz-e1000e-test.c

+++ b/tests/qtest/fuzz-e1000e-test.c

@@ -17,7 +17,7 @@ static void test_lp1879531_eth_get_rss_ex_dst_addr(void)

 {

     QTestState *s;

-    s = qtest_init("-nographic -monitor none -serial none -M pc-q35-5.0");

+    s = qtest_init("-nographic -monitor none -serial none -M pc-q35-rhel8.4.0");

     qtest_outl(s, 0xcf8, 0x80001010);

     qtest_outl(s, 0xcfc, 0xe1020000);

diff --git a/tests/qtest/fuzz-virtio-scsi-test.c b/tests/qtest/fuzz-virtio-scsi-test.c

index e37b48b2cc..88647da054 100644

--- a/tests/qtest/fuzz-virtio-scsi-test.c

+++ b/tests/qtest/fuzz-virtio-scsi-test.c

@@ -19,7 +19,7 @@ static void test_mmio_oob_from_memory_region_cache(void)

 {

     QTestState *s;

-    s = qtest_init("-M pc-q35-5.2 -m 512M "

+    s = qtest_init("-M pc-q35-rhel8.4.0 -m 512M "

                    "-device virtio-scsi,num_queues=8,addr=03.0 ");

     qtest_outl(s, 0xcf8, 0x80001811);

diff --git a/tests/qtest/intel-hda-test.c b/tests/qtest/intel-hda-test.c

index d4a8db6fd6..1a796ec15a 100644

--- a/tests/qtest/intel-hda-test.c

+++ b/tests/qtest/intel-hda-test.c

@@ -38,7 +38,7 @@ static void test_issue542_ich6(void)

 {

     QTestState *s;

-    s = qtest_init("-nographic -nodefaults -M pc-q35-6.2 "

+    s = qtest_init("-nographic -nodefaults -M pc-q35-rhel9.0.0 "

                    "-device intel-hda,id=" HDA_ID CODEC_DEVICES);

     qtest_outl(s, 0xcf8, 0x80000804);

diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build

index cc209a8de5..42a7c529c9 100644

--- a/tests/qtest/libqos/meson.build

+++ b/tests/qtest/libqos/meson.build

@@ -44,7 +44,7 @@ libqos_srcs = files(

         'virtio-rng.c',

         'virtio-scsi.c',

         'virtio-serial.c',

-        'virtio-iommu.c',

+#        'virtio-iommu.c',

         'virtio-gpio.c',

         'generic-pcihost.c',

diff --git a/tests/qtest/lpc-ich9-test.c b/tests/qtest/lpc-ich9-test.c

index 8ac95b89f7..cd2102555c 100644

--- a/tests/qtest/lpc-ich9-test.c

+++ b/tests/qtest/lpc-ich9-test.c

@@ -15,7 +15,7 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void)

 {

     QTestState *s;

-    s = qtest_init("-M pc-q35-5.0 "

+    s = qtest_init("-M pc-q35-rhel8.4.0 "

                    "-nographic -monitor none -serial none");

     qtest_outl(s, 0xcf8, 0x8000f840); /* PMBASE */

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build

index 85ea4e8d99..893afc8eeb 100644

--- a/tests/qtest/meson.build

+++ b/tests/qtest/meson.build

@@ -94,7 +94,6 @@ qtests_i386 = \

    'drive_del-test',

    'tco-test',

    'cpu-plug-test',

-   'q35-test',

    'vmgenid-test',

    'migration-test',

    'test-x86-cpuid-compat',

@@ -223,7 +222,6 @@ qtests_s390x = \

   (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) +                     \

   ['boot-serial-test',

    'drive_del-test',

-   'device-plug-test',

    'virtio-ccw-test',

    'cpu-plug-test',

    'migration-test']

diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c

index 0547d41173..3756ce82d8 100644

--- a/tests/qtest/tco-test.c

+++ b/tests/qtest/tco-test.c

@@ -60,7 +60,7 @@ static void test_init(TestData *d)

     QTestState *qs;

     qs = qtest_initf("-machine q35 %s %s",

-                     d->noreboot ? "-global ICH9-LPC.noreboot=true" : "",

+                     d->noreboot ? "" : "-global ICH9-LPC.noreboot=false",

                      !d->args ? "" : d->args);

     qtest_irq_intercept_in(qs, "ioapic");

diff --git a/tests/qtest/usb-hcd-xhci-test.c b/tests/qtest/usb-hcd-xhci-test.c

index 10ef9d2a91..3855873050 100644

--- a/tests/qtest/usb-hcd-xhci-test.c

+++ b/tests/qtest/usb-hcd-xhci-test.c

@@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)

     usb_test_hotplug(global_qtest, "xhci", "1", NULL);

 }

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 static void test_usb_uas_hotplug(void)

 {

     QTestState *qts = global_qtest;

@@ -36,6 +37,7 @@ static void test_usb_uas_hotplug(void)

     qtest_qmp_device_del(qts, "scsihd");

     qtest_qmp_device_del(qts, "uas");

 }

+#endif

 static void test_usb_ccid_hotplug(void)

 {

@@ -56,7 +58,9 @@ int main(int argc, char **argv)

     qtest_add_func("/xhci/pci/init", test_xhci_init);

     qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);

+#if 0 /* Disabled for Red Hat Enterprise Linux */

     qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);

+#endif

     qtest_add_func("/xhci/pci/hotplug/usb-ccid", test_usb_ccid_hotplug);

     qtest_start("-device nec-usb-xhci,id=xhci"

diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c

index 4a809590bf..1bf3fa641c 100644

--- a/tests/qtest/virtio-net-failover.c

+++ b/tests/qtest/virtio-net-failover.c

@@ -25,6 +25,7 @@

 #define PCI_SEL_BASE            0x0010

 #define BASE_MACHINE "-M q35 -nodefaults " \

+    "-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on " \

     "-device pcie-root-port,id=root0,addr=0x1,bus=pcie.0,chassis=1 " \

     "-device pcie-root-port,id=root1,addr=0x2,bus=pcie.0,chassis=2 "

-- 

2.39.1