[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 RESEND 14/22] tap: introduce a helper to get the
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH V4 RESEND 14/22] tap: introduce a helper to get the name of an interface |
Date: |
Fri, 1 Feb 2013 15:39:48 +0800 |
This patch introduces a helper tap_get_ifname() to get the device name of tap
device. This is needed when ifname is unspecified in the command line and qemu
were asked to create tap device by itself. In this situation, the name were
allocated by kernel, so if multiqueue is asked, we need to fetch its name after
creating the first queue.
Only linux has this support since it's the only platform that supports
multiqueue tap.
Signed-off-by: Jason Wang <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/net/tap.h | 1 +
net/tap-aix.c | 5 +++++
net/tap-bsd.c | 5 +++++
net/tap-haiku.c | 5 +++++
net/tap-linux.c | 14 ++++++++++++++
net/tap-solaris.c | 5 +++++
net/tap_int.h | 1 +
7 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/include/net/tap.h b/include/net/tap.h
index a994f20..c3eb85a 100644
--- a/include/net/tap.h
+++ b/include/net/tap.h
@@ -37,6 +37,7 @@ void tap_set_offload(NetClientState *nc, int csum, int tso4,
int tso6, int ecn,
void tap_set_vnet_hdr_len(NetClientState *nc, int len);
int tap_enable(NetClientState *nc);
int tap_disable(NetClientState *nc);
+int tap_get_ifname(NetClientState *nc, char *ifname);
int tap_get_fd(NetClientState *nc);
diff --git a/net/tap-aix.c b/net/tap-aix.c
index 66e0574..0e1eac3 100644
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -69,3 +69,8 @@ int tap_fd_disable(int fd)
{
return -1;
}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+ return -1;
+}
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 5ed2d16..4f22109 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -155,3 +155,8 @@ int tap_fd_disable(int fd)
{
return -1;
}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+ return -1;
+}
diff --git a/net/tap-haiku.c b/net/tap-haiku.c
index 0f1b1fe..b3b5fbb 100644
--- a/net/tap-haiku.c
+++ b/net/tap-haiku.c
@@ -69,3 +69,8 @@ int tap_fd_disable(int fd)
{
return -1;
}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+ return -1;
+}
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 42376cc..3b21662 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -260,3 +260,17 @@ int tap_fd_disable(int fd)
return ret;
}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+ struct ifreq ifr;
+
+ if (ioctl(fd, TUNGETIFF, &ifr) != 0) {
+ error_report("TUNGETIFF ioctl() failed: %s",
+ strerror(errno));
+ return -1;
+ }
+
+ pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name);
+ return 0;
+}
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index cc08e9e..214d95e 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -235,3 +235,8 @@ int tap_fd_disable(int fd)
{
return -1;
}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+ return -1;
+}
diff --git a/net/tap_int.h b/net/tap_int.h
index ca1c21b..125f83d 100644
--- a/net/tap_int.h
+++ b/net/tap_int.h
@@ -44,5 +44,6 @@ void tap_fd_set_offload(int fd, int csum, int tso4, int tso6,
int ecn, int ufo);
void tap_fd_set_vnet_hdr_len(int fd, int len);
int tap_fd_enable(int fd);
int tap_fd_disable(int fd);
+int tap_fd_get_ifname(int fd, char *ifname);
#endif /* QEMU_TAP_H */
--
1.7.1
- [Qemu-devel] [PATCH V4 RESEND 01/22] net: tap: using bool instead of bitfield, (continued)
- [Qemu-devel] [PATCH V4 RESEND 01/22] net: tap: using bool instead of bitfield, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 02/22] net: tap: use abort() instead of assert(0), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 05/22] net: intorduce qemu_del_nic(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 06/22] net: introduce qemu_find_net_clients_except(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 04/22] net: introduce qemu_get_nic(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 03/22] net: introduce qemu_get_queue(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 07/22] net: introduce qemu_net_client_setup(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 08/22] net: introduce NetClientState destructor, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 13/22] tap: support enabling or disabling a queue, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 14/22] tap: introduce a helper to get the name of an interface,
Jason Wang <=
- [Qemu-devel] [PATCH V4 RESEND 18/22] virtio: add a queue_index to VirtQueue, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 19/22] virtio-net: separate virtqueue from VirtIONet, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 15/22] tap: multiqueue support, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 17/22] virtio: introduce virtio_del_queue(), Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 21/22] virtio-net: migration support for multiqueue, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 12/22] tap: add Linux multiqueue support, Jason Wang, 2013/02/01
- [Qemu-devel] [PATCH V4 RESEND 22/22] virtio-net: compat multiqueue support, Jason Wang, 2013/02/01