From f5c5e38179aff8cc9bb8bd4c9fe42966f0e9f9fd Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 25 Nov 2009 18:49:37 +0000 Subject: net: fix vnet_hdr handling in solaris tap code Print an error if the user specifies vnet_hdr=1 on the cmdline. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- net/tap-solaris.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'net/tap-solaris.c') diff --git a/net/tap-solaris.c b/net/tap-solaris.c index ef4e60c878..e14fe36fdb 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -180,6 +180,17 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required return -1; } pstrcpy(ifname, ifname_size, dev); + if (*vnet_hdr) { + /* Solaris doesn't have IFF_VNET_HDR */ + *vnet_hdr = 0; + + if (vnet_hdr_required && !*vnet_hdr) { + qemu_error("vnet_hdr=1 requested, but no kernel " + "support for IFF_VNET_HDR available"); + close(fd); + return -1; + } + } fcntl(fd, F_SETFL, O_NONBLOCK); return fd; } -- cgit v1.2.1