Export compile directory to guests

Use 9p over virtio to share files on the host with the guest domains.
The files are accessible in the guests /hostfs directory.

13 files changed, 61 insertions, 14 deletions

diff --git a/testing/config/kernel/config-3.5 b/testing/config/kernel/config-3.5
index e92d0b05b..9494331eb 100644
--- a/testing/config/kernel/config-3.5
+++ b/testing/config/kernel/config-3.5
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.5.0 Kernel Configuration
+# Linux/x86_64 3.5.3 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -741,7 +741,9 @@ CONFIG_WIRELESS=y
 #
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+# CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
@@ -1385,7 +1387,7 @@ CONFIG_REISERFS_FS=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FS_POSIX_ACL=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -1464,6 +1466,8 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+CONFIG_9P_FS=y
+CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NLS_CODEPAGE_437 is not set
diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 325e05440..21683b878 100644
--- a/testing/config/kvm/alice.xml
+++ b/testing/config/kvm/alice.xml
@@ -30,6 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:9a:e2:de'/>
       <source network='vnet2'/>
diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml
index 723825bbb..e11200802 100644
--- a/testing/config/kvm/bob.xml
+++ b/testing/config/kvm/bob.xml
@@ -30,9 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:40:85:6b'/>
       <source network='vnet3'/>
diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml
index ec018611d..3bd66f141 100644
--- a/testing/config/kvm/carol.xml
+++ b/testing/config/kvm/carol.xml
@@ -30,9 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:ae:f1:f8'/>
       <source network='vnet1'/>
diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml
index 019191842..526df285a 100644
--- a/testing/config/kvm/dave.xml
+++ b/testing/config/kvm/dave.xml
@@ -30,9 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:b9:15:a9'/>
       <source network='vnet1'/>
diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml
index 8e5769de2..049299312 100644
--- a/testing/config/kvm/moon.xml
+++ b/testing/config/kvm/moon.xml
@@ -25,11 +25,16 @@
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/moon.qcow2'/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:43:e3:35'/>
       <source network='vnet2'/>
diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml
index 01fed44c6..e60129819 100644
--- a/testing/config/kvm/sun.xml
+++ b/testing/config/kvm/sun.xml
@@ -25,11 +25,16 @@
       <driver name='qemu' type='qcow2' cache='writethrough'/>
       <source file='/var/lib/libvirt/images/sun.qcow2'/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:77:43:ea'/>
       <source network='vnet1'/>
diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml
index 3002e23c8..bd00aa563 100644
--- a/testing/config/kvm/venus.xml
+++ b/testing/config/kvm/venus.xml
@@ -30,6 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:69:d3:80'/>
       <source network='vnet2'/>
diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index 3f018f1a8..a23b2489c 100644
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -30,6 +30,11 @@
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <source dir='/var/run/kvm-swan-hostfs'/>
+      <target dir='/hostshare'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </filesystem>
     <interface type='network'>
       <mac address='52:54:00:4b:23:fa'/>
       <source network='vnet1'/>
diff --git a/testing/hosts/default/etc/fstab b/testing/hosts/default/etc/fstab
new file mode 100644
index 000000000..1fb00f42e
--- /dev/null
+++ b/testing/hosts/default/etc/fstab
@@ -0,0 +1 @@
+/hostshare /hostfs 9p trans=virtio,version=9p2000.L 0 0
diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage
index b575ebb50..ac9ee8bbc 100755
--- a/testing/scripts/build-rootimage
+++ b/testing/scripts/build-rootimage
@@ -48,6 +48,7 @@ do_on_exit umount $LOOPDIR/proc
 mkdir -p $LOOPDIR/root/compile
 log_action "Mounting $ROOTIMGCOMPILEDIR as /root/compile"
 execute "mount -o bind $ROOTIMGCOMPILEDIR $LOOPDIR/root/compile"
+do_on_exit rm -r $LOOPDIR/root/compile
 do_on_exit umount $LOOPDIR/root/compile
 
 echo "Installing software from source"
@@ -63,3 +64,5 @@ done
 
 log_action "Removing /etc/resolv.conf"
 execute "rm -f $LOOPDIR/etc/resolv.conf"
+
+mkdir -p $LOOPDIR/hostfs
diff --git a/testing/start-testing b/testing/start-testing
index dce089ad2..e2944bc77 100755
--- a/testing/start-testing
+++ b/testing/start-testing
@@ -6,6 +6,7 @@ NETWORKS="vnet1 vnet2 vnet3"
 CONFDIR=$PWD/config/kvm
 KNLSRC=$BUILDDIR/$KERNEL/arch/x86/boot/bzImage
 KNLTARGET=/var/run/kvm-swan-kernel
+HOSTFSTARGET=/var/run/kvm-swan-hostfs
 
 echo "Starting test environment"
 
@@ -16,6 +17,9 @@ check_commands virsh
 log_action "Deploying kernel $KERNEL"
 execute "ln -fs $KNLSRC $KNLTARGET"
 
+log_action "Deploying $ROOTIMGCOMPILEDIR as hostfs"
+execute "ln -Tfs $ROOTIMGCOMPILEDIR $HOSTFSTARGET"
+
 for net in $NETWORKS
 do
 	log_action "Network $net"
diff --git a/testing/stop-testing b/testing/stop-testing
index 852e2ec9e..5695d620a 100755
--- a/testing/stop-testing
+++ b/testing/stop-testing
@@ -6,6 +6,7 @@ echo "Stopping test environment"
 
 NETWORKS="vnet1 vnet2 vnet3"
 KNLTARGET=/var/run/kvm-swan-kernel
+HOSTFSTARGET=/var/run/kvm-swan-hostfs
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
@@ -26,3 +27,6 @@ done
 
 log_action "Removing kernel $KERNEL"
 execute "rm $KNLTARGET"
+
+log_action "Removing link to hostfs"
+execute "rm $HOSTFSTARGET"