Commit-ID: 2ca9273fe21105b0221cdfd4cee3d695937f9e10 Gitweb: http://git.kernel.org/tip/2ca9273fe21105b0221cdfd4cee3d695937f9e10 Author: Asias He <asias.hejun@xxxxxxxxx> AuthorDate: Wed, 29 Jun 2011 16:47:29 +0800 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Thu, 30 Jun 2011 10:42:45 +0300 kvm tools: Add MACRO for user and tap mode for virtio net This patch prepares the user and tap mode for virtio net. Signed-off-by: Asias He <asias.hejun@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/include/kvm/virtio-net.h | 4 ++++ tools/kvm/virtio/net.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/kvm/include/kvm/virtio-net.h b/tools/kvm/include/kvm/virtio-net.h index 00f3220..e93e8e4 100644 --- a/tools/kvm/include/kvm/virtio-net.h +++ b/tools/kvm/include/kvm/virtio-net.h @@ -8,8 +8,12 @@ struct virtio_net_parameters { const char *host_ip; char guest_mac[6]; const char *script; + int mode; }; void virtio_net__init(const struct virtio_net_parameters *params); +#define NET_MODE_USER 0 +#define NET_MODE_TAP 1 + #endif /* KVM__VIRTIO_NET_H */ diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 6916af6..68967f2 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -63,6 +63,9 @@ struct net_device { int tap_fd; char tap_name[IFNAMSIZ]; + + int mode; + }; static struct net_device ndev = { -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html