Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios...

diff --git a/palacios/include/devices/lnx_virtio_nic.h b/palacios/include/devices/lnx_virtio_nic.h
deleted file mode 100644 (file)
index 0b5b1d2..0000000
--- a/palacios/include/devices/lnx_virtio_nic.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * This file is part of the Palacios Virtual Machine Monitor developed
- * by the V3VEE Project with funding from the United States National 
- * Science Foundation and the Department of Energy.  
- *
- * The V3VEE Project is a joint project between Northwestern University
- * and the University of New Mexico.  You can find out more at 
- * http://www.v3vee.org
- *
- * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
- * Copyright (c) 2008, Lei Xia <lxia@northwestern.edu>
- * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
- * All rights reserved.
- *
- * Author: Jack Lange <jarusl@cs.northwestern.edu>
- *               Lei Xia <lxia@northwestern.edu>
- *              
- *
- * This is free software.  You are permitted to use,
- * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
- */
-
-#ifndef __DEVICES_LNX_VIRTIO_NIC_H__
-#define __DEVICES_LNX_VIRTIO_NIC_H__
-
-
-#endif
-

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 1664821..1a449d6 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -137,6 +137,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
+       depends on PCI
         help
           Enable the Virtio Net