From 9df6c44d1cedf36994ba7732971ec174d26a5243 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:20:32 +0200 Subject: [PATCH 01/19] check: Only test vmxnet3 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 760a0f18b6..b68555e94a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -272,8 +272,8 @@ check-qtest-i386-y += tests/tco-test$(EXESUF) gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c check-qtest-i386-y += $(check-qtest-pci-y) gcov-files-i386-y += $(gcov-files-pci-y) -check-qtest-i386-y += tests/vmxnet3-test$(EXESUF) -gcov-files-i386-y += hw/net/vmxnet3.c +check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF) +gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c gcov-files-i386-y += hw/net/net_rx_pkt.c gcov-files-i386-y += hw/net/net_tx_pkt.c check-qtest-i386-y += tests/pvpanic-test$(EXESUF) From 672d7de51ff8a1c89b9a5d562ed3fcf1550d1922 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:24:17 +0200 Subject: [PATCH 02/19] check: Only test ne2000 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b68555e94a..24c8a9b24c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -222,8 +222,8 @@ gcov-files-pci-y += hw/net/pcnet.c gcov-files-pci-y += hw/net/pcnet-pci.c check-qtest-pci-y += tests/eepro100-test$(EXESUF) gcov-files-pci-y += hw/net/eepro100.c -check-qtest-pci-y += tests/ne2000-test$(EXESUF) -gcov-files-pci-y += hw/net/ne2000.c +check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) +gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c check-qtest-pci-y += tests/nvme-test$(EXESUF) gcov-files-pci-y += hw/block/nvme.c check-qtest-pci-y += tests/ac97-test$(EXESUF) From 8042c13c69397a19962794c730f0ad6a8cd07edd Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:26:27 +0200 Subject: [PATCH 03/19] check: Only test eepro100 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 24c8a9b24c..b900422221 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -220,8 +220,8 @@ gcov-files-pci-y += hw/net/rtl8139.c check-qtest-pci-y += tests/pcnet-test$(EXESUF) gcov-files-pci-y += hw/net/pcnet.c gcov-files-pci-y += hw/net/pcnet-pci.c -check-qtest-pci-y += tests/eepro100-test$(EXESUF) -gcov-files-pci-y += hw/net/eepro100.c +check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF) +gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c check-qtest-pci-y += tests/nvme-test$(EXESUF) From b653696ef9a70b19af0bde7e675258ec23a4b53b Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:30:00 +0200 Subject: [PATCH 04/19] check: Only test pcnet when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b900422221..0a7101c0bf 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -217,9 +217,9 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF) gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c check-qtest-pci-y += tests/rtl8139-test$(EXESUF) gcov-files-pci-y += hw/net/rtl8139.c -check-qtest-pci-y += tests/pcnet-test$(EXESUF) -gcov-files-pci-y += hw/net/pcnet.c -gcov-files-pci-y += hw/net/pcnet-pci.c +check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF) +gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c +gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF) gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) From a3780b22c3950e1c4203c264fc95afb5673662d1 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:30:41 +0200 Subject: [PATCH 05/19] check: Only test rtl8139 when it is compiled in test-file-redirector uses rtl8139 in everything except s390. Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 0a7101c0bf..bac1a7efe0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -215,8 +215,8 @@ check-qtest-pci-y += tests/e1000-test$(EXESUF) gcov-files-pci-y += hw/net/e1000.c check-qtest-pci-y += tests/e1000e-test$(EXESUF) gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c -check-qtest-pci-y += tests/rtl8139-test$(EXESUF) -gcov-files-pci-y += hw/net/rtl8139.c +check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF) +gcov-files-pci-$(CONFIG_RTL8139_PCI) += hw/net/rtl8139.c check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF) gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c @@ -306,7 +306,7 @@ check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF) check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) -check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF) +check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF) check-qtest-i386-y += tests/migration-test$(EXESUF) check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF) @@ -356,7 +356,7 @@ gcov-files-ppc64-y += hw/usb/hcd-xhci.c check-qtest-ppc64-y += $(check-qtest-virtio-y) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) -check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF) +check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF) check-qtest-ppc64-y += tests/display-vga-test$(EXESUF) check-qtest-ppc64-y += tests/numa-test$(EXESUF) check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF) From e48085f1aaa5a389b8e078ee9363e65e7ba41c64 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:50:08 +0200 Subject: [PATCH 06/19] check: Only test es1370 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index bac1a7efe0..386e3db7d7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -228,8 +228,8 @@ check-qtest-pci-y += tests/nvme-test$(EXESUF) gcov-files-pci-y += hw/block/nvme.c check-qtest-pci-y += tests/ac97-test$(EXESUF) gcov-files-pci-y += hw/audio/ac97.c -check-qtest-pci-y += tests/es1370-test$(EXESUF) -gcov-files-pci-y += hw/audio/es1370.c +check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF) +gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c check-qtest-pci-y += $(check-qtest-virtio-y) gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c check-qtest-pci-y += tests/tpci200-test$(EXESUF) From f5f3e02a456b74d8000f3d7cb84210f00186e5c4 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 15:50:42 +0200 Subject: [PATCH 07/19] check: Only test ac97 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 386e3db7d7..e90a8a251c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -226,8 +226,8 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c check-qtest-pci-y += tests/nvme-test$(EXESUF) gcov-files-pci-y += hw/block/nvme.c -check-qtest-pci-y += tests/ac97-test$(EXESUF) -gcov-files-pci-y += hw/audio/ac97.c +check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF) +gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF) gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c check-qtest-pci-y += $(check-qtest-virtio-y) From e995ed241448b421e73828be1b448d909b45ac0f Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 19:01:55 +0200 Subject: [PATCH 08/19] check: Only test hda when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index e90a8a251c..ff8534056a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -243,8 +243,8 @@ gcov-files-pci-y += hw/display/vga-pci.c gcov-files-pci-y += hw/display/virtio-gpu.c gcov-files-pci-y += hw/display/virtio-gpu-pci.c gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c -check-qtest-pci-y += tests/intel-hda-test$(EXESUF) -gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c +check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF) +gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF) gcov-files-pci-y += hw/misc/ivshmem.c check-qtest-pci-y += tests/megasas-test$(EXESUF) From 6b4b089701a94aa589e752ecc03c2c18c29a0356 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 16:27:49 +0200 Subject: [PATCH 09/19] check: Only test ipack when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index ff8534056a..7d13966055 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -232,10 +232,10 @@ check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF) gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c check-qtest-pci-y += $(check-qtest-virtio-y) gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c -check-qtest-pci-y += tests/tpci200-test$(EXESUF) -gcov-files-pci-y += hw/ipack/tpci200.c -check-qtest-pci-y += $(check-qtest-ipack-y) -gcov-files-pci-y += $(gcov-files-ipack-y) +check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF) +gcov-files-pci-$(CONFIG_IPACK) += hw/ipack/tpci200.c +check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y) +gcov-files-pci-$(CONFIG_IPACK) += $(gcov-files-ipack-y) check-qtest-pci-y += tests/display-vga-test$(EXESUF) gcov-files-pci-y += hw/display/vga.c gcov-files-pci-y += hw/display/cirrus_vga.c From 4a39edd8b42c0f1f0b5d54a6b4617f71379d8361 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 18:30:10 +0200 Subject: [PATCH 10/19] check: Only test ioh3420 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 7d13966055..7891e27849 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -280,8 +280,8 @@ check-qtest-i386-y += tests/pvpanic-test$(EXESUF) gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c check-qtest-i386-y += tests/i82801b11-test$(EXESUF) gcov-files-i386-y += hw/pci-bridge/i82801b11.c -check-qtest-i386-y += tests/ioh3420-test$(EXESUF) -gcov-files-i386-y += hw/pci-bridge/ioh3420.c +check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF) +gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF) gcov-files-i386-y += hw/usb/hcd-ohci.c check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF) From d7d5e279c25a5710824d040a5b3f0fe19f3a7dfa Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 19:02:03 +0200 Subject: [PATCH 11/19] check: Only test i82801b11 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 7891e27849..d5029c4aaa 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -278,8 +278,8 @@ gcov-files-i386-y += hw/net/net_rx_pkt.c gcov-files-i386-y += hw/net/net_tx_pkt.c check-qtest-i386-y += tests/pvpanic-test$(EXESUF) gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c -check-qtest-i386-y += tests/i82801b11-test$(EXESUF) -gcov-files-i386-y += hw/pci-bridge/i82801b11.c +check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF) +gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF) gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF) From 9fd36a15e1fe2fd1cfed46871f9e7c1515b85b14 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 18:52:52 +0200 Subject: [PATCH 12/19] check: Only test sdhci when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index d5029c4aaa..9fcd4ce24b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -311,7 +311,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF) check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF) check-qtest-x86_64-y += $(check-qtest-i386-y) -check-qtest-x86_64-y += tests/sdhci-test$(EXESUF) +check-qtest-x86_64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF) gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) @@ -385,11 +385,11 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF) gcov-files-arm-y += hw/timer/arm_mptimer.c check-qtest-arm-y += tests/boot-serial-test$(EXESUF) -check-qtest-arm-y += tests/sdhci-test$(EXESUF) +check-qtest-arm-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF) check-qtest-arm-y += tests/hexloader-test$(EXESUF) check-qtest-aarch64-y = tests/numa-test$(EXESUF) -check-qtest-aarch64-y += tests/sdhci-test$(EXESUF) +check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF) check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF) check-qtest-microblazeel-y = $(check-qtest-microblaze-y) From 7b0706503e5c9eff254537ea0a29041c4cf42771 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 19:18:14 +0200 Subject: [PATCH 13/19] check: Only test wdt_ib700 when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9fcd4ce24b..da153ac566 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -267,9 +267,9 @@ check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF) check-qtest-i386-y += tests/i440fx-test$(EXESUF) check-qtest-i386-y += tests/fw_cfg-test$(EXESUF) check-qtest-i386-y += tests/drive_del-test$(EXESUF) -check-qtest-i386-y += tests/wdt_ib700-test$(EXESUF) +check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF) +gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c check-qtest-i386-y += tests/tco-test$(EXESUF) -gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c check-qtest-i386-y += $(check-qtest-pci-y) gcov-files-i386-y += $(gcov-files-pci-y) check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF) From c0b5be52474c7cbe39424119cd2ea376a6ae42a7 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 22:51:53 +0200 Subject: [PATCH 14/19] check: Only test pvpanic when it is compiled in It was not possible to compile out pvpanic. Use the same trick than applesmc. Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- hw/misc/pvpanic.c | 11 ----------- include/hw/misc/pvpanic.h | 11 ++++++++++- tests/Makefile.include | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index b26250dec9..9d8961ba0c 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -99,17 +99,6 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(d, &s->io, s->ioport); } -#define PVPANIC_IOPORT_PROP "ioport" - -uint16_t pvpanic_port(void) -{ - Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL); - if (!o) { - return 0; - } - return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL); -} - static Property pvpanic_isa_properties[] = { DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), DEFINE_PROP_END_OF_LIST(), diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 36a54e270c..1ee071a703 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -16,6 +16,15 @@ #define TYPE_PVPANIC "pvpanic" -uint16_t pvpanic_port(void); +#define PVPANIC_IOPORT_PROP "ioport" + +static inline uint16_t pvpanic_port(void) +{ + Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL); + if (!o) { + return 0; + } + return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL); +} #endif diff --git a/tests/Makefile.include b/tests/Makefile.include index da153ac566..5d50bf1074 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -276,8 +276,8 @@ check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF) gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c gcov-files-i386-y += hw/net/net_rx_pkt.c gcov-files-i386-y += hw/net/net_tx_pkt.c -check-qtest-i386-y += tests/pvpanic-test$(EXESUF) -gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c +check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF) +gcov-files-i386-$(CONFIG_PVPANIC) += i386-softmmu/hw/misc/pvpanic.c check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF) gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF) From 4e205f154dae6f102273b4ed05838db5c5dc46c9 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 22:56:55 +0200 Subject: [PATCH 15/19] check: Only test nvme when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 5d50bf1074..fcccd12ff3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -224,8 +224,8 @@ check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF) gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c -check-qtest-pci-y += tests/nvme-test$(EXESUF) -gcov-files-pci-y += hw/block/nvme.c +check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF) +gcov-files-pci-$(CONFIG_NVME_PCI) += hw/block/nvme.c check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF) gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF) From bc19828d321cc945f1992de1e1158668b2380732 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 10 Jul 2018 23:13:41 +0200 Subject: [PATCH 16/19] check: Only test usb-ohci when it is compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index fcccd12ff3..fc32a68ee9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -282,8 +282,8 @@ check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF) gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF) gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c -check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF) -gcov-files-i386-y += hw/usb/hcd-ohci.c +check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF) +gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF) gcov-files-i386-y += hw/usb/hcd-uhci.c check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF) @@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y += tests/migration-test$(EXESUF) check-qtest-ppc64-y += tests/rtas-test$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) -check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF) -gcov-files-ppc64-y += hw/usb/hcd-ohci.c +check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF) +gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF) gcov-files-ppc64-y += hw/usb/hcd-uhci.c check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF) From 7c0dfc33e8581c44bbf6db16aea7c958d30d3729 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 11 Jul 2018 18:51:04 +0200 Subject: [PATCH 17/19] check: Only test usb-uhci devices when they are compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index fc32a68ee9..0b8fb4637c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -284,8 +284,8 @@ check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF) gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF) gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c -check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF) -gcov-files-i386-y += hw/usb/hcd-uhci.c +check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF) +gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF) gcov-files-i386-y += hw/usb/hcd-ehci.c gcov-files-i386-y += hw/usb/dev-hid.c @@ -349,8 +349,8 @@ check-qtest-ppc64-y += tests/rtas-test$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF) gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c -check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF) -gcov-files-ppc64-y += hw/usb/hcd-uhci.c +check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF) +gcov-files-ppc64-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF) gcov-files-ppc64-y += hw/usb/hcd-xhci.c check-qtest-ppc64-y += $(check-qtest-virtio-y) From dad5ddcea3b661c6b8ffd83b9bdf0c56001067a2 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 17 Jul 2018 12:01:47 +0200 Subject: [PATCH 18/19] check: Only test usb-ehci when it is compiled in The ehci test also test uhci. Welcome to the worderfull world of USB. Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 0b8fb4637c..de296ed3e1 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -286,8 +286,10 @@ check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF) gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF) gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c +ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy) check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF) -gcov-files-i386-y += hw/usb/hcd-ehci.c +endif +gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c gcov-files-i386-y += hw/usb/dev-hid.c gcov-files-i386-y += hw/usb/dev-storage.c check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF) From 889d52a243fb6f1d19c92dec2c8055a7f4efbe22 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 11 Jul 2018 10:47:31 +0200 Subject: [PATCH 19/19] check: Only test tpm devices when they are compiled in Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index de296ed3e1..6dc8d06f4c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -302,10 +302,10 @@ check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EX ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),) check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF) endif -check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-swtpm-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF) -check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF) +check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-swtpm-test$(EXESUF) +check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-test$(EXESUF) +check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF) +check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-test$(EXESUF) check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)