Suggested-by: Andrew Jones <drjones@xxxxxxxxxx>
Cc: Thomas Huth <thuth@xxxxxxxxxx>
Cc: Andrew Jones <drjones@xxxxxxxxxx>
Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
---
arm/Makefile.common | 1 +
arm/pci-test.c | 8 ++++++++
arm/run | 7 ++++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/arm/Makefile.common b/arm/Makefile.common
index 97179bbea4e7..f37b5c2a3de4 100644
--- a/arm/Makefile.common
+++ b/arm/Makefile.common
@@ -36,6 +36,7 @@ cflatobjs += lib/alloc.o
cflatobjs += lib/devicetree.o
cflatobjs += lib/pci.o
cflatobjs += lib/pci-host-generic.o
+cflatobjs += lib/pci-testdev.o
cflatobjs += lib/virtio.o
cflatobjs += lib/virtio-mmio.o
cflatobjs += lib/chr-testdev.o
diff --git a/arm/pci-test.c b/arm/pci-test.c
index 315a4e5e986c..3030f2cfaf59 100644
--- a/arm/pci-test.c
+++ b/arm/pci-test.c
@@ -8,8 +8,12 @@
#include <libcflat.h>
#include <pci.h>
+#define NR_TESTS (PCI_TESTDEV_NUM_BARS * PCI_TESTDEV_NUM_TESTS)
+
int main(void)
{
+ int ret;
+
if (!pci_probe()) {
printf("PCI bus probing failed\n");
abort();
@@ -17,5 +21,9 @@ int main(void)
pci_print();
+ ret = pci_testdev();
+ report("PCI test device passed %d/%d tests",
+ ret >= NR_TESTS, ret > 0 ? ret : 0, NR_TESTS);
+
return report_summary();
}
diff --git a/arm/run b/arm/run
index a2f35ef6a7e6..1ee6231599d6 100755
--- a/arm/run
+++ b/arm/run
@@ -67,8 +67,13 @@ fi
chr_testdev='-device virtio-serial-device'
chr_testdev+=' -device virtconsole,chardev=ctd -chardev testdev,id=ctd'
+pci_testdev=
+if $qemu $M -device '?' 2>&1 | grep pci-testdev > /dev/null; then
+ pci_testdev="-device pci-testdev"
+fi
+
M+=",accel=$ACCEL"
-command="$qemu $M -cpu $processor $chr_testdev"
+command="$qemu $M -cpu $processor $chr_testdev $pci_testdev"
command+=" -display none -serial stdio -kernel"
command="$(timeout_cmd) $command"
echo $command "$@"
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
