[Xen-changelog] [xen-unstable] [minios] Fix test application link when pcifront is not enabled

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
# Date 1354267918 0
# Node ID eb3bf80d8dac0b4cd2eed227245aa469baf5ca5b
# Parent  0cf1f79bc4f880d5f961630d4f29119ac70139f0
[minios] Fix test application link when pcifront is not enabled

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

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 0cf1f79bc4f8 -r eb3bf80d8dac extras/mini-os/test.c
--- a/extras/mini-os/test.c     Fri Nov 30 09:26:30 2012 +0000
+++ b/extras/mini-os/test.c     Fri Nov 30 09:31:58 2012 +0000
@@ -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
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog