3294ce1893
<libutil.h> and <util.h> on *BSD (some have one, some another) were #included just for openpty() declaration. The only file where this function is actually used is qemu-char.c. In vl.c and net/tap-bsd.c, none of functions declared in libutil.h (login logout logwtmp timdomain openpty forkpty uu_lock realhostname fparseln and a few others depending on version) are used. Initially the code which is currently in qemu-char.c was in vl.c, it has been removed into separate file in commit0e82f34d07
Fri Oct 31 18:44:40 2008, but the #includes were left in vl.c. So with vl.c, we just remove includes - libutil.h, util.h and pty.h (which declares only openpty() and forkpty()) from there. The code in net/tap-bsd.c, which come from net/tap.c, had this commit5281d757ef
Author: Mark McLoughlin <markmc@redhat.com> Date: Thu Oct 22 17:49:07 2009 +0100 net: split all the tap code out into net/tap.c Note this commit not only moved stuff out of net.c to net/tap.c, but also rewrote large portions of the tap code, and added these completely unnecessary #includes -- as usual, I question why such a misleading commit messages are allowed. Again, no functions defined in libutil.h or util.h on *BSD are used by neither net/tap.c nor net/tap-bsd.c. Removing them. And finally, the only real user for these #includes, qemu-char.c, which actually uses openpty(). There, the #ifdef logic is wrong. A GLIBC-based system has <pty.h>, even if it is a variant of *BSD. So __GLIBC__ should be checked first, and instead of trying to include <libutil.h> or <util.h>, we include <pty.h>. If it is not GLIBC-based, we check for variations between <*util.h> as before. This patch fixes build of qemu 1.1 on Debian/kFreebsd (well, one of the two problems): it is a distribution with a FreeBSD kernel, so it #defines at least __FreeBSD_kernel__, but since it is based on GLIBC, it has <pty.h>, but current version does not have neither <util.h> nor <libutil.h>, which the code tries to include 3 times but uses only once. Signed-off-By: Michael Tokarev <mjt@tls.msk.ru> Cc: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
148 lines
3.8 KiB
C
148 lines
3.8 KiB
C
/*
|
|
* QEMU System Emulator
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "net/tap.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu.h"
|
|
#include "qemu-error.h"
|
|
|
|
#ifdef __NetBSD__
|
|
#include <sys/ioctl.h>
|
|
#include <net/if.h>
|
|
#include <net/if_tap.h>
|
|
#endif
|
|
|
|
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
|
|
{
|
|
int fd;
|
|
#ifdef TAPGIFNAME
|
|
struct ifreq ifr;
|
|
#else
|
|
char *dev;
|
|
struct stat s;
|
|
#endif
|
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
|
|
/* if no ifname is given, always start the search from tap0/tun0. */
|
|
int i;
|
|
char dname[100];
|
|
|
|
for (i = 0; i < 10; i++) {
|
|
if (*ifname) {
|
|
snprintf(dname, sizeof dname, "/dev/%s", ifname);
|
|
} else {
|
|
#if defined(__OpenBSD__)
|
|
snprintf(dname, sizeof dname, "/dev/tun%d", i);
|
|
#else
|
|
snprintf(dname, sizeof dname, "/dev/tap%d", i);
|
|
#endif
|
|
}
|
|
TFR(fd = open(dname, O_RDWR));
|
|
if (fd >= 0) {
|
|
break;
|
|
}
|
|
else if (errno == ENXIO || errno == ENOENT) {
|
|
break;
|
|
}
|
|
if (*ifname) {
|
|
break;
|
|
}
|
|
}
|
|
if (fd < 0) {
|
|
error_report("warning: could not open %s (%s): no virtual network emulation",
|
|
dname, strerror(errno));
|
|
return -1;
|
|
}
|
|
#else
|
|
TFR(fd = open("/dev/tap", O_RDWR));
|
|
if (fd < 0) {
|
|
fprintf(stderr,
|
|
"warning: could not open /dev/tap: no virtual network emulation: %s\n",
|
|
strerror(errno));
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef TAPGIFNAME
|
|
if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) {
|
|
fprintf(stderr, "warning: could not get tap name: %s\n",
|
|
strerror(errno));
|
|
return -1;
|
|
}
|
|
pstrcpy(ifname, ifname_size, ifr.ifr_name);
|
|
#else
|
|
if (fstat(fd, &s) < 0) {
|
|
fprintf(stderr,
|
|
"warning: could not stat /dev/tap: no virtual network emulation: %s\n",
|
|
strerror(errno));
|
|
return -1;
|
|
}
|
|
dev = devname(s.st_rdev, S_IFCHR);
|
|
pstrcpy(ifname, ifname_size, dev);
|
|
#endif
|
|
|
|
if (*vnet_hdr) {
|
|
/* BSD doesn't have IFF_VNET_HDR */
|
|
*vnet_hdr = 0;
|
|
|
|
if (vnet_hdr_required && !*vnet_hdr) {
|
|
error_report("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;
|
|
}
|
|
|
|
int tap_set_sndbuf(int fd, QemuOpts *opts)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int tap_probe_vnet_hdr(int fd)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int tap_probe_has_ufo(int fd)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int tap_probe_vnet_hdr_len(int fd, int len)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void tap_fd_set_vnet_hdr_len(int fd, int len)
|
|
{
|
|
}
|
|
|
|
void tap_fd_set_offload(int fd, int csum, int tso4,
|
|
int tso6, int ecn, int ufo)
|
|
{
|
|
}
|