From 1cfdb4d9a717988ec2594693068c4a9a01663e87 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 8 Sep 2013 20:50:54 +0100
Subject: [PATCH] arm: tests: 9p: Modify name of virtio-9p-pci device when
 using virtio-mmio.

It's called virtio-9p-device on virtio-mmio.
---
 tests/9p/test-9p.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/9p/test-9p.sh b/tests/9p/test-9p.sh
index 62e7fa5f2..16e9e4c2a 100755
--- a/tests/9p/test-9p.sh
+++ b/tests/9p/test-9p.sh
@@ -32,13 +32,24 @@ if [[ "$backend" != "direct" ]]; then
     exit 77
 fi
 
+# The name of the virtio-9p device is different on virtio-pci and virtio-mmio.
+arch="$(uname -m)"
+if [[ "$arch" =~ ^arm ]]; then
+    virtio_mmio=yes
+fi
+if [ "$virtio_mmio" != "yes" ]; then
+    virtio_9p=virtio-9p-pci
+else
+    virtio_9p=virtio-9p-device
+fi
+
 rm -f test-9p.img test-9p.out
 
 ../../fish/guestfish <<EOF
 # This dummy disk is not actually used, but libguestfs requires one.
 sparse test-9p.img 1M
 
-config -device 'virtio-9p-pci,fsdev=test9p,mount_tag=test9p'
+config -device '$virtio_9p,fsdev=test9p,mount_tag=test9p'
 config -fsdev 'local,id=test9p,path=$(pwd),security_model=passthrough'
 
 run