From: Jack Lange Date: Thu, 3 Dec 2009 22:40:10 +0000 (-0600) Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=da1657c1b2c2bd79450953f8bffada73f040b556;hp=5bf6d0c260240e314876a2fca8e3fd56bd6a1029 Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel --- diff --git a/palacios/include/devices/lnx_virtio_nic.h b/palacios/include/devices/lnx_virtio_nic.h deleted file mode 100644 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 - * Copyright (c) 2008, Lei Xia - * Copyright (c) 2008, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * Lei Xia - * - * - * 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 --- 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