]> xenbits.xensource.com Git - people/liuw/mini-os.git/commitdiff
[minios] Fix test application link when pcifront is not enabled
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Fri, 30 Nov 2012 09:31:58 +0000 (09:31 +0000)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Fri, 30 Nov 2012 09:31:58 +0000 (09:31 +0000)
When pcifront is not enabled, the test application needs to disable
the PCI test.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Committed-by: Keir Fraser <keir@xen.org>
test.c

diff --git a/test.c b/test.c
index 9039cb3bf38ac0772d9ac256be157e607b31a021..7baf1fbe5735b23f4f4178c1d0ba43d4c2ce36e7 100644 (file)
--- a/test.c
+++ b/test.c
@@ -413,6 +413,7 @@ static void kbdfront_thread(void *p)
     }
 }
 
+#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 @@ static void pcifront_thread(void *p)
     printk("PCI devices:\n");
     pcifront_scan(pci_dev, print_pcidev);
 }
+#endif
 
 int app_main(start_info_t *si)
 {
@@ -446,7 +448,9 @@ int app_main(start_info_t *si)
     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 @@ void shutdown_frontends(void)
     if (kbd_dev)
         shutdown_kbdfront(kbd_dev);
 
+#ifdef CONFIG_PCIFRONT
     if (pci_dev)
         shutdown_pcifront(pci_dev);
+#endif
 }