From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [minios] Fix test application link when pcifront is not
	enabled
Date: Wed, 28 Nov 2012 21:28:56 +0100
Message-ID: <20121128202856.GA10257@type>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org, Keir Fraser <keir@xen.org>
List-Id: xen-devel@lists.xenproject.org

When pcifront is not enabled, the test application needs to disable the
PCI test.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff -r 321f8487379b extras/mini-os/test.c
--- a/extras/mini-os/test.c	Thu Nov 15 10:25:29 2012 +0000
+++ b/extras/mini-os/test.c	Wed Nov 28 21:27:22 2012 +0100
@@ -413,6 +413,7 @@
     }
 }
 
+#ifdef CONFIG_PCIFRONT
 static struct pcifront_dev *pci_dev;
 
 static void print_pcidev(unsigned int domain, unsigned int bus, unsigned int slot, unsigned int fun)
@@ -436,6 +437,7 @@
     printk("PCI devices:\n");
     pcifront_scan(pci_dev, print_pcidev);
 }
+#endif
 
 int app_main(start_info_t *si)
 {
@@ -446,7 +448,9 @@
     create_thread("blkfront", blkfront_thread, si);
     create_thread("fbfront", fbfront_thread, si);
     create_thread("kbdfront", kbdfront_thread, si);
+#ifdef CONFIG_PCIFRONT
     create_thread("pcifront", pcifront_thread, si);
+#endif
     return 0;
 }
 
@@ -464,6 +468,8 @@
     if (kbd_dev)
         shutdown_kbdfront(kbd_dev);
 
+#ifdef CONFIG_PCIFRONT
     if (pci_dev)
         shutdown_pcifront(pci_dev);
+#endif
 }